backport #484 to v2

Author: jackcmay

token/program/Cargo.toml

@@ -21,7 +21,7 @@ default = ["solana-sdk/default"]
 num-derive = "0.3"
 num-traits = "0.2"
 remove_dir_all = "=0.5.0"
-solana-sdk = { version = "1.3.11", default-features = false, optional = true }
+solana-sdk = { version = "1.3.12", default-features = false, optional = true }
 thiserror = "1.0"
 arrayref = "0.3.6"
 num_enum = "0.5.1"

token/program/src/instruction.rs

@@ -1,9 +1,10 @@
 //! Instruction types
 
-use crate::{error::TokenError, option::COption};
+use crate::error::TokenError;
 use solana_sdk::{
     instruction::{AccountMeta, Instruction},
     program_error::ProgramError,
+    program_option::COption,
     pubkey::Pubkey,
     sysvar,
 };

token/program/src/lib.rs

@@ -7,8 +7,6 @@ pub mod entrypoint;
 pub mod error;
 pub mod instruction;
 pub mod native_mint;
-pub mod option;
-pub mod pack;
 pub mod processor;
 pub mod state;