Bump solana-sdk to 1.2.10 (#124)

This allows solana-labs/solana#11015 to build

Author: Aaron1011

memo/Cargo.lock

@@ -11,8 +11,7 @@ license = "Apache-2.0"
 edition = "2018"
 
 [dependencies]
-solana-sdk = { version = "1.2.4", default-features = false, features=["program"] }
-solana-sdk-bpf-test = { version = "1.2.4", default-features = false }
+solana-sdk = { version = "=1.2.10", default-features = false, features=["program"] }
 
 [lib]
 name = "spl_memo"

memo/Cargo.toml

@@ -18,7 +18,7 @@ fn process_instruction<'a>(
 
 // Pulls in the stubs required for `info!()`
 #[cfg(not(target_arch = "bpf"))]
-solana_sdk_bpf_test::stubs!();
+solana_sdk::program_stubs!();
 
 #[cfg(test)]
 mod tests {

memo/src/processor.rs

@@ -14,8 +14,7 @@ edition = "2018"
 num-derive = "0.2"
 num-traits = "0.2"
 remove_dir_all = "=0.5.0"
-solana-sdk = { version = "=1.2.0", default-features = false, features=["program"] }
-solana-sdk-bpf-test = { path = "../bin/bpf-sdk/rust/test", default-features = false }
+solana-sdk = { version = "=1.2.10", default-features = false, features=["program"] }
 spl-token = { path = "../token" }
 thiserror = "1.0"
 

token-swap/Cargo.lock

@@ -7,7 +7,7 @@ use solana_sdk::program::invoke_signed;
 use solana_sdk::{
     info,
     program_error::{PrintProgramError, ProgramError},
-    program_utils::DecodeError,
+    decode_error::DecodeError,
 };
 use thiserror::Error;
 

token-swap/Cargo.toml

@@ -8,7 +8,7 @@ use crate::{
 use solana_sdk::program::invoke_signed;
 use solana_sdk::{
     account_info::AccountInfo, entrypoint::ProgramResult, info, instruction::Instruction,
-    program_error::ProgramError, program_utils::next_account_info, pubkey::Pubkey,
+    program_error::ProgramError, account_info::next_account_info, pubkey::Pubkey,
 };
 use std::mem::size_of;
 
@@ -541,7 +541,7 @@ mod tests {
 
     // Pulls in the stubs required for `info!()`
     #[cfg(not(target_arch = "bpf"))]
-    solana_sdk_bpf_test::stubs!();
+    solana_sdk::program_stubs!();
 
     fn pubkey_rand() -> Pubkey {
         Pubkey::new(&rand::random::<[u8; 32]>())

token-swap/src/error.rs

@@ -14,8 +14,7 @@ edition = "2018"
 num-derive = "0.2"
 num-traits = "0.2"
 remove_dir_all = "=0.5.0"
-solana-sdk = { version = "=1.2.0", default-features = false, features=["program"] }
-solana-sdk-bpf-test = { path = "../bin/bpf-sdk/rust/test", default-features = false }
+solana-sdk = { version = "=1.2.10", default-features = false, features=["program"] }
 thiserror = "1.0"
 
 [dev-dependencies]

token-swap/src/state.rs

@@ -21,6 +21,11 @@
  */
 #define Token_MIN_SIGNERS 1
 
+/**
+ * Program state handler.
+ */
+typedef struct Token_State Token_State;
+
 /**
  * Instructions supported by the token program.
  */
@@ -182,12 +187,12 @@ typedef enum Token_TokenInstruction_Tag {
      *
      * Accounts expected by this instruction:
      *
-     *   * Single owner/delegate
+     *   * Single owner
      *   0. `[writable]` The account to close.
      *   1. '[writable]' The destination account.
      *   2. `[signer]` The account's owner.
      *
-     *   * Multisignature owner/delegate
+     *   * Multisignature owner
      *   0. `[writable]` The account to close.
      *   1. '[writable]' The destination account.
      *   2. `[]` The account's multisignature owner.
@@ -253,107 +258,3 @@ typedef struct Token_TokenInstruction {
         Token_Burn_Body burn;
     };
 } Token_TokenInstruction;
-
-typedef uint8_t Token_Pubkey[32];
-
-/**
- * A C representation of Rust's `std::option::Option`
- */
-typedef enum Token_COption_Pubkey_Tag {
-    /**
-     * No value
-     */
-    None_Pubkey,
-    /**
-     * Some value `T`
-     */
-    Some_Pubkey,
-} Token_COption_Pubkey_Tag;
-
-typedef struct Token_Some_Body_Pubkey {
-    Token_Pubkey _0;
-} Token_Some_Body_Pubkey;
-
-typedef struct Token_COption_Pubkey {
-    Token_COption_Pubkey_Tag tag;
-    union {
-        Token_Some_Body_Pubkey some;
-    };
-} Token_COption_Pubkey;
-
-/**
- * Mint data.
- */
-typedef struct Token_Mint {
-    /**
-     * Optional owner, used to mint new tokens.  The owner may only
-     * be provided during mint creation.  If no owner is present then the mint
-     * has a fixed supply and no further tokens may be minted.
-     */
-    Token_COption_Pubkey owner;
-    /**
-     * Number of base 10 digits to the right of the decimal place.
-     */
-    uint8_t decimals;
-    /**
-     * Is `true` if this structure has been initialized
-     */
-    bool is_initialized;
-} Token_Mint;
-
-/**
- * Account data.
- */
-typedef struct Token_Account {
-    /**
-     * The mint associated with this account
-     */
-    Token_Pubkey mint;
-    /**
-     * The owner of this account.
-     */
-    Token_Pubkey owner;
-    /**
-     * The amount of tokens this account holds.
-     */
-    uint64_t amount;
-    /**
-     * If `delegate` is `Some` then `delegated_amount` represents
-     * the amount authorized by the delegate
-     */
-    Token_COption_Pubkey delegate;
-    /**
-     * Is `true` if this structure has been initialized
-     */
-    bool is_initialized;
-    /**
-     * Is this a native token
-     */
-    bool is_native;
-    /**
-     * The amount delegated
-     */
-    uint64_t delegated_amount;
-} Token_Account;
-
-/**
- * Multisignature data.
- */
-typedef struct Token_Multisig {
-    /**
-     * Number of signers required
-     */
-    uint8_t m;
-    /**
-     * Number of valid signers
-     */
-    uint8_t n;
-    /**
-     * Is `true` if this structure has been initialized
-     */
-    bool is_initialized;
-    /**
-     * Signer public keys
-     */
-    Token_Pubkey signers[Token_MAX_SIGNERS];
-} Token_Multisig;