Removes native loader entrypoints from the SDK

program-runtime/src/native_loader.rs

@@ -9,11 +9,11 @@ use serde::Serialize;
 use solana_sdk::{
     account::ReadableAccount,
     decode_error::DecodeError,
-    entrypoint_native::ProgramEntrypoint,
     instruction::InstructionError,
-    keyed_account::keyed_account_at_index,
+    keyed_account::{keyed_account_at_index, KeyedAccount},
     native_loader,
-    process_instruction::{InvokeContext, LoaderEntrypoint},
+    process_instruction::InvokeContext,
+    pubkey::Pubkey,
 };
 use std::{
     collections::HashMap,
@@ -24,6 +24,29 @@ use std::{
 };
 use thiserror::Error;
 
+/// Prototype of a native loader entry point
+///
+/// program_id: Program ID of the currently executing program
+/// keyed_accounts: Accounts passed as part of the instruction
+/// instruction_data: Instruction data
+/// invoke_context: Invocation context
+pub type LoaderEntrypoint = unsafe extern "C" fn(
+    program_id: &Pubkey,
+    instruction_data: &[u8],
+    invoke_context: &dyn InvokeContext,
+) -> Result<(), InstructionError>;
+
+// Prototype of a native program entry point
+///
+/// program_id: Program ID of the currently executing program
+/// keyed_accounts: Accounts passed as part of the instruction
+/// instruction_data: Instruction data
+pub type ProgramEntrypoint = unsafe extern "C" fn(
+    program_id: &Pubkey,
+    keyed_accounts: &[KeyedAccount],
+    instruction_data: &[u8],
+) -> Result<(), InstructionError>;
+
 #[derive(Error, Debug, Serialize, Clone, PartialEq, FromPrimitive, ToPrimitive)]
 pub enum NativeLoaderError {
     #[error("Entrypoint name in the account data is not a valid UTF-8 string")]

sdk/src/lib.rs

@@ -20,7 +20,6 @@ pub mod deserialize_utils;
 pub mod ed25519_instruction;
 pub mod entrypoint;
 pub mod entrypoint_deprecated;
-pub mod entrypoint_native;
 pub mod epoch_info;
 pub mod exit;
 pub mod feature;

sdk/src/process_instruction.rs

@@ -12,18 +12,6 @@ use solana_sdk::{
 };
 use std::{cell::RefCell, fmt::Debug, rc::Rc, sync::Arc};
 
-/// Prototype of a native loader entry point
-///
-/// program_id: Program ID of the currently executing program
-/// keyed_accounts: Accounts passed as part of the instruction
-/// instruction_data: Instruction data
-/// invoke_context: Invocation context
-pub type LoaderEntrypoint = unsafe extern "C" fn(
-    program_id: &Pubkey,
-    instruction_data: &[u8],
-    invoke_context: &dyn InvokeContext,
-) -> Result<(), InstructionError>;
-
 pub type ProcessInstructionWithContext =
     fn(usize, &[u8], &mut dyn InvokeContext) -> Result<(), InstructionError>;