[WIP]: FIX CI

Author: jim4067

basics/account-data/quasar/Cargo.toml

@@ -22,13 +22,13 @@ client = []
 debug = []
 
 [dependencies]
-quasar-lang = { git = "https://github.com/blueshift-gg/quasar", branch = "master" }
+quasar-lang = { git = "https://github.com/blueshift-gg/quasar" }
 solana-instruction = { version = "3.2.0" }
 
 [dev-dependencies]
 # Not using the generated client: it depends on quasar_lang::client::DynBytes
 # which isn't in the published crate yet. Tests build instruction data manually.
-quasar-svm = { version = "0.1" }
+quasar-svm = { git = "https://github.com/blueshift-gg/quasar-svm" }
 solana-account = { version = "3.4.0" }
 solana-address = { version = "2.2.0", features = ["decode"] }
 solana-instruction = { version = "3.2.0", features = ["bincode"] }

basics/account-data/quasar/Quasar.toml

@@ -5,18 +5,4 @@ name = "quasar_account_data"
 type = "solana"
 
 [testing]
-language = "rust"
-
-[testing.rust]
-framework = "quasar-svm"
-
-[testing.rust.test]
-program = "cargo"
-args = [
-    "test",
-    "tests::",
-]
-
-[clients]
-path = "target/client"
-languages = ["rust"]
+framework = "quasarsvm-rust"

basics/account-data/quasar/src/instructions/create.rs

@@ -1,17 +1,15 @@
 use {
-    crate::state::AddressInfo,
-    quasar_lang::prelude::*,
+    crate::state::{AddressInfo, AddressInfoInner},
+    quasar_lang::{prelude::*, sysvars::Sysvar},
 };
 
 /// Accounts for creating a new address info account.
-/// Dynamic accounts use owned `Account<T>` rather than `&'info mut Account<T>` because
-/// dynamic types carry cached byte offsets that cannot be represented as a pointer cast.
 #[derive(Accounts)]
 pub struct CreateAddressInfo {
     #[account(mut)]
     pub payer: Signer,
     #[account(mut, init, payer = payer, seeds = AddressInfo::seeds(payer), bump)]
-    pub address_info: Account<AddressInfo<'_>>,
+    pub address_info: Account<AddressInfo>,
     pub system_program: Program<System>,
 }
 
@@ -23,12 +21,11 @@ pub fn handle_create_address_info(
     street: &str,
     city: &str,
 ) -> Result<(), ProgramError> {
+    let rent = Rent::get()?;
     accounts.address_info.set_inner(
-        house_number,
-        name,
-        street,
-        city,
+        AddressInfoInner { house_number, name, street, city },
         accounts.payer.to_account_view(),
-        None,
+        rent.lamports_per_byte(),
+        rent.exemption_threshold_raw(),
     )
 }

basics/account-data/quasar/src/lib.rs

@@ -25,10 +25,10 @@ mod quasar_account_data {
     #[instruction(discriminator = 0)]
     pub fn create_address_info(
         ctx: Ctx<CreateAddressInfo>,
-        name: String,
         house_number: u8,
-        street: String,
-        city: String,
+        name: String<50>,
+        street: String<50>,
+        city: String<50>,
     ) -> Result<(), ProgramError> {
         instructions::handle_create_address_info(&mut ctx.accounts, name, house_number, street, city)
     }

basics/account-data/quasar/src/state.rs

@@ -1,15 +1,12 @@
 use quasar_lang::prelude::*;
 
 /// Onchain address info account with dynamic string fields.
-/// Uses Quasar's `String<P, N>` marker type for variable-length string data.
-/// The lifetime `'a` is required because the generated code produces `&'a str` accessors.
-///
 /// Note: Quasar requires all fixed-size fields to precede dynamic (String/Vec) fields.
-#[account(discriminator = 1)]
+#[account(discriminator = 1, set_inner)]
 #[seeds(b"address_info", payer: Address)]
-pub struct AddressInfo<'a> {
+pub struct AddressInfo {
     pub house_number: u8,
-    pub name: String<u8, 50>,
-    pub street: String<u8, 50>,
-    pub city: String<u8, 50>,
+    pub name: String<50>,
+    pub street: String<50>,
+    pub city: String<50>,
 }

basics/checking-accounts/quasar/Cargo.toml

@@ -22,12 +22,12 @@ client = []
 debug = []
 
 [dependencies]
-quasar-lang = { git = "https://github.com/blueshift-gg/quasar", branch = "master" }
+quasar-lang = { git = "https://github.com/blueshift-gg/quasar" }
 solana-instruction = { version = "3.2.0" }
 
 [dev-dependencies]
 quasar-checking-accounts-client = { path = "target/client/rust/quasar-checking-accounts-client" }
-quasar-svm = { version = "0.1" }
+quasar-svm = { git = "https://github.com/blueshift-gg/quasar-svm" }
 solana-account = { version = "3.4.0" }
 solana-address = { version = "2.2.0", features = ["decode"] }
 solana-instruction = { version = "3.2.0", features = ["bincode"] }

basics/checking-accounts/quasar/Quasar.toml

@@ -5,18 +5,4 @@ name = "quasar_checking_accounts"
 type = "solana"
 
 [testing]
-language = "rust"
-
-[testing.rust]
-framework = "quasar-svm"
-
-[testing.rust.test]
-program = "cargo"
-args = [
-    "test",
-    "tests::",
-]
-
-[clients]
-path = "target/client"
-languages = ["rust"]
+framework = "quasarsvm-rust"

basics/close-account/quasar/Cargo.toml

@@ -20,11 +20,11 @@ client = []
 debug = []
 
 [dependencies]
-quasar-lang = { git = "https://github.com/blueshift-gg/quasar", branch = "master" }
+quasar-lang = { git = "https://github.com/blueshift-gg/quasar" }
 solana-instruction = { version = "3.2.0" }
 
 [dev-dependencies]
-quasar-svm = { version = "0.1" }
+quasar-svm = { git = "https://github.com/blueshift-gg/quasar-svm" }
 solana-account = { version = "3.4.0" }
 solana-address = { version = "2.2.0", features = ["decode"] }
 solana-instruction = { version = "3.2.0", features = ["bincode"] }

basics/close-account/quasar/Quasar.toml

@@ -5,18 +5,4 @@ name = "quasar_close_account"
 type = "solana"
 
 [testing]
-language = "rust"
-
-[testing.rust]
-framework = "quasar-svm"
-
-[testing.rust.test]
-program = "cargo"
-args = [
-    "test",
-    "tests::",
-]
-
-[clients]
-path = "target/client"
-languages = ["rust"]
+framework = "quasarsvm-rust"

basics/close-account/quasar/src/instructions/close_user.rs

@@ -1,7 +1,4 @@
-use {
-    crate::state::UserState,
-    quasar_lang::prelude::*,
-};
+use {crate::state::UserState, quasar_lang::prelude::*};
 
 /// Accounts for closing a user account.
 /// The `close = user` attribute in the Anchor version triggers an automatic epilogue.
@@ -12,7 +9,7 @@ pub struct CloseUser {
     #[account(mut)]
     pub user: Signer,
     #[account(mut)]
-    pub user_account: Account<UserState<'_>>,
+    pub user_account: Account<UserState>,
 }
 
 #[inline(always)]