Add cpi feature

Author: febo

sdk/pinocchio/Cargo.toml

@@ -19,12 +19,13 @@ unexpected_cfgs = { level = "warn", check-cfg = [
 
 [features]
 copy = ["solana-account-view/copy", "solana-address/copy"]
+cpi = ["dep:solana-instruction-view"]
 std = ["solana-address/std"]
 
 [dependencies]
 solana-account-view = { workspace = true }
 solana-address = { workspace = true, features = ["syscalls"] }
-solana-instruction-view = { workspace = true, features = ["cpi"] }
+solana-instruction-view = { workspace = true, features = ["cpi"], optional = true }
 solana-program-error = { workspace = true }
 
 [dev-dependencies]

sdk/pinocchio/src/lib.rs

@@ -243,7 +243,8 @@ pub use solana_address as address;
 pub use solana_address::Address;
 
 // Re-export the `solana_instruction_view` for downstream use.
-pub use solana_instruction_view as instruction;
+#[cfg(feature = "cpi")]
+pub use {solana_instruction_view as instruction, solana_instruction_view::cpi};
 
 // Re-export the `solana_program_error` for downstream use.
 pub use solana_program_error as error;

sdk/pinocchio/src/sysvars/instructions.rs

@@ -1,10 +1,11 @@
 use core::{marker::PhantomData, mem::size_of, ops::Deref};
 
+#[cfg(feature = "cpi")]
+use crate::instruction::AccountRole;
 use crate::{
     account::{AccountView, Ref},
     address::ADDRESS_BYTES,
     error::ProgramError,
-    instruction::AccountRole,
     Address,
 };
 
@@ -242,6 +243,7 @@ impl IntrospectedAccountRole {
         (self.flags & IS_SIGNER) != 0
     }
 
+    #[cfg(feature = "cpi")]
     /// Convert the `IntrospectedAccountRole` to an `AccountRole`.
     #[inline(always)]
     pub fn to_account_role(&self) -> AccountRole {