ci tests

Author: bengtlofgren

svm/modules/executor-requests/src/lib.rs

@@ -129,13 +129,15 @@ impl RelayInstructionsBuilder {
 
     /// Add a GasInstruction to the relay instructions.
     pub fn with_gas(mut self, gas_limit: u128, msg_value: u128) -> Self {
-        self.data.extend(make_relay_instruction_gas(gas_limit, msg_value));
+        self.data
+            .extend(make_relay_instruction_gas(gas_limit, msg_value));
         self
     }
 
     /// Add a GasDropOffInstruction to the relay instructions.
     pub fn with_gas_drop_off(mut self, drop_off: u128, recipient: &[u8; 32]) -> Self {
-        self.data.extend(make_relay_instruction_gas_drop_off(drop_off, recipient));
+        self.data
+            .extend(make_relay_instruction_gas_drop_off(drop_off, recipient));
         self
     }
 

svm/pinocchio/README.md

@@ -11,9 +11,9 @@ These programs use the [Pinocchio](https://github.com/febo/pinocchio) framework,
 
 ## Devnet Deployments
 
-| Program                | Address                                        |
-| ---------------------- | ---------------------------------------------- |
-| executor-quoter        | `qtrxiqVAfVS61utwZLUi7UKugjCgFaNxBGyskmGingz`  |
+| Program                | Address                                       |
+| ---------------------- | --------------------------------------------- |
+| executor-quoter        | `qtrxiqVAfVS61utwZLUi7UKugjCgFaNxBGyskmGingz` |
 | executor-quoter-router | `qtrrrV7W3E1jnX1145wXR6ZpthG19ur5xHC1n6PPhDV` |
 
 ## Directory Structure

svm/pinocchio/programs/executor-quoter-router/src/instructions/executor_cpi.rs

@@ -9,7 +9,8 @@ use alloc::vec::Vec;
 
 /// Anchor discriminator for executor::request_for_execution
 /// Generated from: sha256("global:request_for_execution")[0..8]
-const EXECUTOR_REQUEST_FOR_EXECUTION_DISCRIMINATOR: [u8; 8] = [0x6d, 0x6b, 0x57, 0x25, 0x97, 0xc0, 0x77, 0x73];
+const EXECUTOR_REQUEST_FOR_EXECUTION_DISCRIMINATOR: [u8; 8] =
+    [0x6d, 0x6b, 0x57, 0x25, 0x97, 0xc0, 0x77, 0x73];
 
 /// Builds instruction data for Anchor executor::request_for_execution CPI.
 ///

svm/pinocchio/programs/executor-quoter-router/src/instructions/quote_execution.rs

@@ -146,11 +146,14 @@ pub fn process(program_id: &Pubkey, accounts: &[AccountInfo], data: &[u8]) -> Pr
         data: cpi_data,
     };
 
-    pinocchio::cpi::invoke(&cpi_instruction, &[quoter_config, quoter_chain_info, quoter_quote_body])?;
+    pinocchio::cpi::invoke(
+        &cpi_instruction,
+        &[quoter_config, quoter_chain_info, quoter_quote_body],
+    )?;
 
     // Get return data from quoter and forward it
-    let return_data = pinocchio::cpi::get_return_data()
-        .ok_or(ExecutorQuoterRouterError::InvalidReturnData)?;
+    let return_data =
+        pinocchio::cpi::get_return_data().ok_or(ExecutorQuoterRouterError::InvalidReturnData)?;
     set_return_data(return_data.as_slice());
 
     Ok(())

svm/pinocchio/programs/executor-quoter-router/src/instructions/request_execution.rs

@@ -199,13 +199,18 @@ pub fn process(program_id: &Pubkey, accounts: &[AccountInfo], data: &[u8]) -> Pr
 
     pinocchio::cpi::invoke(
         &quoter_cpi_instruction,
-        &[quoter_config, quoter_chain_info, quoter_quote_body, event_cpi],
+        &[
+            quoter_config,
+            quoter_chain_info,
+            quoter_quote_body,
+            event_cpi,
+        ],
     )?;
 
     // Get return data from quoter: (required_payment, payee_address, quote_body)
     // Layout: 8 bytes payment + 32 bytes payee + 32 bytes quote_body = 72 bytes
-    let return_data = pinocchio::cpi::get_return_data()
-        .ok_or(ExecutorQuoterRouterError::InvalidReturnData)?;
+    let return_data =
+        pinocchio::cpi::get_return_data().ok_or(ExecutorQuoterRouterError::InvalidReturnData)?;
 
     if return_data.len() < 72 {
         return Err(ExecutorQuoterRouterError::InvalidReturnData.into());
@@ -270,10 +275,7 @@ pub fn process(program_id: &Pubkey, accounts: &[AccountInfo], data: &[u8]) -> Pr
         data: &executor_ix_data,
     };
 
-    pinocchio::cpi::invoke(
-        &executor_cpi_instruction,
-        &[payer, payee, system_program],
-    )?;
+    pinocchio::cpi::invoke(&executor_cpi_instruction, &[payer, payee, system_program])?;
 
     Ok(())
 }

svm/pinocchio/programs/executor-quoter-router/src/instructions/serialization.rs

@@ -119,5 +119,4 @@ impl GovernanceMessage {
     pub fn signed_message<'a>(&self, original_data: &'a [u8]) -> &'a [u8] {
         &original_data[0..98]
     }
-
 }

svm/pinocchio/programs/executor-quoter-router/src/lib.rs

@@ -31,10 +31,8 @@ pub const OUR_CHAIN: u16 = 1;
 
 /// Executor program ID: execXUrAsMnqMmTHj5m7N1YQgsDz3cwGLYCYyuDRciV
 pub const EXECUTOR_PROGRAM_ID: Pubkey = [
-    0x09, 0xb9, 0x69, 0x71, 0x58, 0x3b, 0x59, 0x03,
-    0xe0, 0x28, 0x1d, 0xa9, 0x65, 0x48, 0xd5, 0xd2,
-    0x3c, 0x65, 0x1f, 0x7a, 0x9c, 0xcd, 0xe3, 0xea,
-    0xd5, 0x2b, 0x42, 0xf6, 0xb7, 0xda, 0xc2, 0xd2,
+    0x09, 0xb9, 0x69, 0x71, 0x58, 0x3b, 0x59, 0x03, 0xe0, 0x28, 0x1d, 0xa9, 0x65, 0x48, 0xd5, 0xd2,
+    0x3c, 0x65, 0x1f, 0x7a, 0x9c, 0xcd, 0xe3, 0xea, 0xd5, 0x2b, 0x42, 0xf6, 0xb7, 0xda, 0xc2, 0xd2,
 ];
 
 /// Instruction discriminators

svm/pinocchio/programs/executor-quoter-router/src/state.rs

@@ -66,4 +66,3 @@ pub fn load_account<T: Pod + Copy + Discriminator>(
         .map_err(|_| ProgramError::InvalidAccountData)?;
     Ok(*account)
 }
-

svm/pinocchio/programs/executor-quoter/build.rs

@@ -8,7 +8,8 @@ fn main() {
 
     // Parse QUOTER_UPDATER_PUBKEY env var (base58 pubkey string)
     // Falls back to a default test pubkey if not set
-    let updater_pubkey = env::var("QUOTER_UPDATER_PUBKEY").expect("Updater pubkey must be set at build time");
+    let updater_pubkey =
+        env::var("QUOTER_UPDATER_PUBKEY").expect("Updater pubkey must be set at build time");
 
     // Parse QUOTER_PAYEE_PUBKEY env var (base58 pubkey string)
     // Falls back to same as updater if not set
@@ -17,10 +18,18 @@ fn main() {
     // Decode base58 to bytes
     let updater_bytes = bs58::decode(&updater_pubkey)
         .into_vec()
-        .unwrap_or_else(|e| panic!("QUOTER_UPDATER_PUBKEY '{}' is not valid base58: {}", updater_pubkey, e));
-    let payee_bytes = bs58::decode(&payee_pubkey)
-        .into_vec()
-        .unwrap_or_else(|e| panic!("QUOTER_PAYEE_PUBKEY '{}' is not valid base58: {}", payee_pubkey, e));
+        .unwrap_or_else(|e| {
+            panic!(
+                "QUOTER_UPDATER_PUBKEY '{}' is not valid base58: {}",
+                updater_pubkey, e
+            )
+        });
+    let payee_bytes = bs58::decode(&payee_pubkey).into_vec().unwrap_or_else(|e| {
+        panic!(
+            "QUOTER_PAYEE_PUBKEY '{}' is not valid base58: {}",
+            payee_pubkey, e
+        )
+    });
 
     assert_eq!(
         updater_bytes.len(),

svm/pinocchio/programs/executor-quoter/src/lib.rs

@@ -20,10 +20,8 @@ use instructions::*;
 
 /// Program ID - replace with actual deployed address
 pub static ID: Pubkey = [
-    0x0d, 0xf8, 0xc4, 0xd6, 0x7b, 0x42, 0x89, 0xd6,
-    0x3e, 0xf0, 0x63, 0x1b, 0x5d, 0x0c, 0x39, 0x18,
-    0x2e, 0x8c, 0x9a, 0x4f, 0x7f, 0x9d, 0x8a, 0x3b,
-    0x6c, 0x5e, 0x4d, 0x3c, 0x2b, 0x1a, 0x09, 0xf8,
+    0x0d, 0xf8, 0xc4, 0xd6, 0x7b, 0x42, 0x89, 0xd6, 0x3e, 0xf0, 0x63, 0x1b, 0x5d, 0x0c, 0x39, 0x18,
+    0x2e, 0x8c, 0x9a, 0x4f, 0x7f, 0x9d, 0x8a, 0x3b, 0x6c, 0x5e, 0x4d, 0x3c, 0x2b, 0x1a, 0x09, 0xf8,
 ];
 
 // =============================================================================