Fix imports

Author: febo

Cargo.lock

@@ -23,8 +23,9 @@ pinocchio = { version = "0.9", path = "sdk/pinocchio" }
 pinocchio-log-macro = { version = "0.5", path = "sdk/log/macro" }
 quote = "1.0"
 regex = "1"
-solana-account-view = { version = "0.0.0", git = "https://github.com/febo/solana-sdk.git", branch = "solana-account-view" }
-solana-address = { version = "1.0", git = "https://github.com/febo/solana-sdk.git", branch = "solana-account-view" }
+solana-account-view = { version = "0.0.0", git = "https://github.com/febo/solana-sdk.git", branch = "solana-instruction-view" }
+solana-address = { version = "1.0", git = "https://github.com/febo/solana-sdk.git", branch = "solana-instruction-view" }
+solana-instruction-view = { version = "0.0.0", git = "https://github.com/febo/solana-sdk.git", branch = "solana-instruction-view" }
 syn = "1.0"
 
 [workspace.metadata.cli]

Cargo.toml

@@ -23,7 +23,8 @@ std = ["solana-address/std"]
 [dependencies]
 solana-account-view = { workspace = true }
 solana-address = { workspace = true, features = ["syscalls"] }
-solana-program-error = { version = "3.0.0", git = "https://github.com/febo/solana-sdk.git", branch = "solana-account-view" }
+solana-instruction-view = { workspace = true, features = ["cpi"] }
+solana-program-error = { version = "3.0.0", git = "https://github.com/febo/solana-sdk.git", branch = "solana-instruction-view" }
 
 [dev-dependencies]
 five8_const = { workspace = true }

sdk/pinocchio/Cargo.toml

@@ -9,8 +9,6 @@ use crate::{
 };
 use solana_address::Address;
 
-use crate::{program_error::ProgramError, BPF_ALIGN_OF_U128, NON_DUP_MARKER};
-
 /// Declare the lazy program entrypoint.
 ///
 /// Use the `lazy_program_entrypoint!` macro instead.

sdk/pinocchio/src/entrypoint/lazy.rs

@@ -23,8 +23,6 @@ use crate::{
 };
 use solana_address::Address;
 
-use crate::{BPF_ALIGN_OF_U128, NON_DUP_MARKER};
-
 /// Start address of the memory region used for program heap.
 pub const HEAP_START_ADDRESS: u64 = 0x300000000;
 

sdk/pinocchio/src/entrypoint/mod.rs

@@ -235,6 +235,7 @@ pub use entrypoint::lazy as lazy_entrypoint;
 pub use solana_account_view as account_view;
 // Re-export the `solana_address` for downstream use.
 pub use solana_address as address;
+pub use solana_instruction_view as instruction_view;
 // Re-export the `solana_program_error` for downstream use.
 pub use solana_program_error as program_error;
 pub use solana_program_error::ProgramResult;

sdk/pinocchio/src/lib.rs

@@ -58,7 +58,7 @@ define_syscall!(fn sol_invoke_signed_rust(instruction_addr: *const u8, account_i
 define_syscall!(fn sol_set_return_data(data: *const u8, length: u64));
 define_syscall!(fn sol_get_return_data(data: *mut u8, length: u64, program_id: *mut u8) -> u64);
 define_syscall!(fn sol_log_data(data: *const u8, data_len: u64));
-define_syscall!(fn sol_get_processed_sibling_instruction(index: u64, meta: *mut ProcessedSiblingInstruction, program_id: *mut u8, data: *mut u8, accounts: *mut AccountMeta) -> u64);
+define_syscall!(fn sol_get_processed_sibling_instruction(index: u64, meta: *mut u8, program_id: *mut u8, data: *mut u8, accounts: *mut u8) -> u64);
 define_syscall!(fn sol_get_stack_height() -> u64);
 define_syscall!(fn sol_curve_validate_point(curve_id: u64, point_addr: *const u8, result: *mut u8) -> u64);
 define_syscall!(fn sol_curve_group_op(curve_id: u64, group_op: u64, left_input_addr: *const u8, right_input_addr: *const u8, result_point_addr: *mut u8) -> u64);

sdk/pinocchio/src/syscalls.rs

@@ -3,7 +3,7 @@ use solana_address::{Address, ADDRESS_BYTES};
 
 use crate::{
     account_view::{AccountView, Ref},
-    instruction::AccountMeta,
+    instruction_view::AccountPrivilege,
     program_error::ProgramError,
 };
 
@@ -241,7 +241,7 @@ impl IntrospectedAccountMeta {
 
     /// Convert the `IntrospectedAccountMeta` to an `AccountMeta`.
     #[inline(always)]
-    pub fn to_account_meta(&self) -> AccountMeta {
-        AccountMeta::new(&self.key, self.is_writable(), self.is_signer())
+    pub fn to_account_meta(&self) -> AccountPrivilege {
+        AccountPrivilege::new(&self.key, self.is_writable(), self.is_signer())
     }
 }

sdk/pinocchio/src/sysvars/instructions.rs

@@ -11,7 +11,6 @@ use crate::{
     program_error::ProgramError,
     sysvars::Sysvar,
 };
-use solana_address::Address;
 
 /// The ID of the rent sysvar.
 pub const RENT_ID: Address = Address::new_from_array([