Port SPL to solana-program and cargo build-bpf

Author: mvines

program/src/Cargo.toml

@@ -1,6 +1,3 @@
-
-# Note: This crate must be built using do.sh
-
 [package]
 name = "spl-memo"
 version = "1.0.9"
@@ -11,12 +8,10 @@ license = "Apache-2.0"
 edition = "2018"
 
 [features]
-no-entrypoint = []
-program = ["solana-sdk/program"]
-default = ["solana-sdk/default"]
+exclude_entrypoint = []
 
 [dependencies]
-solana-sdk = { version = "1.3.17", default-features = false, optional = true }
+solana-program = "1.4.3"
 
 [lib]
 name = "spl_memo"

program/src/entrypoint.rs

@@ -1,11 +1,8 @@
-//! Program entrypoint definitions
+//! Program entrypoint
 
-#![cfg(feature = "program")]
-#![cfg(not(feature = "no-entrypoint"))]
-
-use solana_sdk::{
-    account_info::AccountInfo, entrypoint, entrypoint::ProgramResult, program_error::ProgramError,
-    pubkey::Pubkey,
+use solana_program::{
+    account_info::AccountInfo, entrypoint, entrypoint::ProgramResult, info,
+    program_error::ProgramError, pubkey::Pubkey,
 };
 use std::str::from_utf8;
 
@@ -15,18 +12,15 @@ fn process_instruction<'a>(
     _accounts: &'a [AccountInfo<'a>],
     instruction_data: &[u8],
 ) -> ProgramResult {
+    info!("hi");
     from_utf8(instruction_data).map_err(|_| ProgramError::InvalidInstructionData)?;
     Ok(())
 }
 
-// Pull in syscall stubs when building for non-BPF targets
-#[cfg(not(target_arch = "bpf"))]
-solana_sdk::program_stubs!();
-
 #[cfg(test)]
 mod tests {
     use super::*;
-    use solana_sdk::{program_error::ProgramError, pubkey::Pubkey};
+    use solana_program::{program_error::ProgramError, pubkey::Pubkey};
 
     #[test]
     fn test_utf8_memo() {

program/src/lib.rs

@@ -2,10 +2,10 @@
 
 //! A simple program that accepts a string of encoded characters and verifies that it parses. Currently handles UTF-8.
 
-pub mod entrypoint;
+#[cfg(not(feature = "exclude_entrypoint"))]
+mod entrypoint;
 
-// Export current solana-sdk types for downstream users who may also be building with a different
-// solana-sdk version
-pub use solana_sdk;
+// Export current sdk types for downstream users building with a different sdk version
+pub use solana_program;
 
-solana_sdk::declare_id!("Memo1UhkJRfHyvLMcVucJwxXeuD728EqVDDwQDxFMNo");
+solana_program::declare_id!("Memo1UhkJRfHyvLMcVucJwxXeuD728EqVDDwQDxFMNo");