Fix pinocchio::msg macro and unused Cargo.toml key

Author: Harshbhargav45

Cargo.lock

@@ -43,4 +43,3 @@ overflow-checks = true
 lto = "fat"
 codegen-units = 1
 opt-level = 3
-solana-address = { path = "./patched/solana-address" }

Cargo.toml

@@ -69,18 +69,8 @@ impl<'a> TryFrom<&'a [AccountView]> for InitializeMarketAccounts<'a> {
         }
 
         // 2. Extract by index - named vars for readability
-        let [
-            payer,
-            market,
-            base_vault,
-            quote_vault,
-            base_mint,
-            quote_mint,
-            system_program,
-            token_program,
-            associated_token_program,
-            rent_sysvar,
-        ] = accounts
+        let [payer, market, base_vault, quote_vault, base_mint, quote_mint, system_program, token_program, associated_token_program, rent_sysvar] =
+            accounts
         else {
             return Err(FluxDexError::InvalidArgument);
         };
@@ -151,26 +141,13 @@ impl<'a> TryFrom<&'a [AccountView]> for PlaceOrderAccounts<'a> {
             Some(&accounts[12])
         } else {
             if accounts.len() != 12 {
-                pinocchio::msg!("Invalid account length");
                 return Err(FluxDexError::InvalidAccountCount);
             }
             None
         };
 
-        let [
-            trader,
-            market,
-            order,
-            trader_base_ata,
-            trader_quote_ata,
-            base_vault,
-            quote_vault,
-            base_mint,
-            quote_mint,
-            system_program,
-            token_program,
-            oracle_price,
-        ] = &accounts[..12]
+        let [trader, market, order, trader_base_ata, trader_quote_ata, base_vault, quote_vault, base_mint, quote_mint, system_program, token_program, oracle_price] =
+            &accounts[..12]
         else {
             return Err(FluxDexError::InvalidArgument);
         };
@@ -241,18 +218,8 @@ impl<'a> TryFrom<&'a [AccountView]> for CancelOrderAccounts<'a> {
             return Err(FluxDexError::InvalidAccountCount);
         }
 
-        let [
-            trader,
-            market,
-            order,
-            trader_base_ata,
-            trader_quote_ata,
-            base_vault,
-            quote_vault,
-            base_mint,
-            quote_mint,
-            token_program,
-        ] = accounts
+        let [trader, market, order, trader_base_ata, trader_quote_ata, base_vault, quote_vault, base_mint, quote_mint, token_program] =
+            accounts
         else {
             return Err(FluxDexError::InvalidArgument);
         };
@@ -320,16 +287,8 @@ impl<'a> TryFrom<&'a [AccountView]> for MatchOrdersAccounts<'a> {
             return Err(FluxDexError::InvalidAccountCount);
         }
 
-        let [
-            crank_authority,
-            market,
-            orderbook,
-            base_vault,
-            quote_vault,
-            buyer_order,
-            seller_order,
-            oracle_price,
-        ] = accounts
+        let [crank_authority, market, orderbook, base_vault, quote_vault, buyer_order, seller_order, oracle_price] =
+            accounts
         else {
             return Err(FluxDexError::InvalidArgument);
         };
@@ -393,17 +352,8 @@ impl<'a> TryFrom<&'a [AccountView]> for SettleTradeAccounts<'a> {
             return Err(FluxDexError::InvalidAccountCount);
         }
 
-        let [
-            crank_authority,
-            market,
-            base_vault,
-            quote_vault,
-            buyer_token_account,
-            seller_token_account,
-            base_mint,
-            quote_mint,
-            token_program,
-        ] = accounts
+        let [crank_authority, market, base_vault, quote_vault, buyer_token_account, seller_token_account, base_mint, quote_mint, token_program] =
+            accounts
         else {
             return Err(FluxDexError::InvalidArgument);
         };
@@ -554,18 +504,8 @@ impl<'a> TryFrom<&'a [AccountView]> for DelegateOrderbookAccounts<'a> {
             return Err(FluxDexError::InvalidAccountCount);
         }
 
-        let [
-            authority,
-            market,
-            orderbook,
-            buffer,
-            delegation_record,
-            delegation_metadata,
-            delegation_program,
-            system_program,
-            rent_sysvar,
-            self_program,
-        ] = accounts
+        let [authority, market, orderbook, buffer, delegation_record, delegation_metadata, delegation_program, system_program, rent_sysvar, self_program] =
+            accounts
         else {
             return Err(FluxDexError::InvalidArgument);
         };

src/instruction.rs

@@ -1,11 +1,11 @@
 #![deny(clippy::unwrap_used)]
 
-use pinocchio::{AccountView, Address, ProgramResult, entrypoint};
+use pinocchio::{entrypoint, AccountView, Address, ProgramResult};
 
 pub mod error;
 pub mod instruction;
-pub mod oracle;
 pub mod magicblock;
+pub mod oracle;
 pub mod pmm;
 pub mod processor;
 pub mod state;

src/lib.rs

@@ -1,7 +1,7 @@
-use pinocchio::cpi::{Seed, Signer, invoke_signed};
+use pinocchio::cpi::{invoke_signed, Seed, Signer};
 use pinocchio::instruction::{InstructionAccount, InstructionView};
-use pinocchio::sysvars::Sysvar;
 use pinocchio::sysvars::rent::Rent;
+use pinocchio::sysvars::Sysvar;
 use pinocchio::{AccountView, Address, ProgramResult};
 
 /// MagicBlock Delegation Program ID (`DELeGGvXpWV2fqJUhqcF5ZSYMS4JTLjteaAMARRSaeSh`)

src/magicblock.rs

@@ -1,6 +1,5 @@
 /// Pyth Price Feed Oracle Validation Module
 /// Validates SOL/USDC price feed from Pyth for on-chain order validation
-
 use pinocchio::AccountView;
 
 /// Maximum acceptable confidence interval ratio: 5%
@@ -18,11 +17,11 @@ pub const PYTH_PRICE_TYPE: u8 = 3;
 /// Result of oracle price validation
 #[derive(Debug, Clone, Copy)]
 pub struct OraclePriceData {
-    pub price: u64,           // Price in quote currency (e.g., cents for USD)
-    pub confidence: u64,      // Standard deviation confidence interval
-    pub publish_time: i64,    // Unix timestamp when published
-    pub exponent: i32,        // Exponent for fixed-point representation
-    pub is_valid: bool,       // Whether price passed validation checks
+    pub price: u64,        // Price in quote currency (e.g., cents for USD)
+    pub confidence: u64,   // Standard deviation confidence interval
+    pub publish_time: i64, // Unix timestamp when published
+    pub exponent: i32,     // Exponent for fixed-point representation
+    pub is_valid: bool,    // Whether price passed validation checks
 }
 
 /// Validate Pyth price feed account
@@ -62,14 +61,13 @@ pub fn validate_pyth_price(
     // Parse price feed structure
     // For simplicity, we read the price components from known offsets
     // This is a simplified validation - production should use pyth-sdk
-    
+
     // Offset 32: price (i64, little-endian)
     if data.len() < 40 {
         return None;
     }
     let price_bytes = [
-        data[32], data[33], data[34], data[35],
-        data[36], data[37], data[38], data[39],
+        data[32], data[33], data[34], data[35], data[36], data[37], data[38], data[39],
     ];
     let price = i64::from_le_bytes(price_bytes) as u64;
 
@@ -78,8 +76,7 @@ pub fn validate_pyth_price(
         return None;
     }
     let confidence_bytes = [
-        data[40], data[41], data[42], data[43],
-        data[44], data[45], data[46], data[47],
+        data[40], data[41], data[42], data[43], data[44], data[45], data[46], data[47],
     ];
     let confidence = u64::from_le_bytes(confidence_bytes);
 
@@ -88,8 +85,7 @@ pub fn validate_pyth_price(
         return None;
     }
     let publish_time_bytes = [
-        data[48], data[49], data[50], data[51],
-        data[52], data[53], data[54], data[55],
+        data[48], data[49], data[50], data[51], data[52], data[53], data[54], data[55],
     ];
     let publish_time = i64::from_le_bytes(publish_time_bytes);
 
@@ -102,7 +98,7 @@ pub fn validate_pyth_price(
 
     // Validate confidence ratio: conf / price < 5%
     let confidence_ratio = if price > 0 {
-        (confidence * 10000) / price  // basis points
+        (confidence * 10000) / price // basis points
     } else {
         10000 // invalid if price is 0
     };