Safer pack/unpack (solana-labs#349)

* Safer pack/unpack * fix cli * clippy * fix swap * nit * clippy Co-authored-by: Michael Vines <mvines@gmail.com>
vkomenda · Aug 28, 2020 · 2a5acff · 2a5acff
1 parent 74bf8a1
commit 2a5acff
Show file tree

Hide file tree

Showing 10 changed files with 1,159 additions and 942 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/token-swap/program/src/processor.rs b/token-swap/program/src/processor.rs
@@ -17,6 +17,7 @@ use solana_sdk::{
     entrypoint::ProgramResult, info, program_error::PrintProgramError, program_error::ProgramError,
     pubkey::Pubkey,
 };
+use spl_token::pack::Pack;
 use std::mem::size_of;
 
 impl State {
@@ -68,14 +69,19 @@ impl State {
     pub fn token_account_deserialize(
         info: &AccountInfo,
     ) -> Result<spl_token::state::Account, Error> {
-        Ok(*spl_token::state::unpack(&mut info.data.borrow_mut())
-            .map_err(|_| Error::ExpectedAccount)?)
+        spl_token::state::Account::unpack_from_slice(&info.data.borrow_mut())
+            .map_err(|_| Error::ExpectedAccount)
+        // Ok(*spl_token::state::unpack(&mut info.data.borrow_mut())
+        //     .map_err(|_| Error::ExpectedAccount)?)
     }
 
     /// Deserializes a spl_token `Mint`.
     pub fn mint_deserialize(info: &AccountInfo) -> Result<spl_token::state::Mint, Error> {
-        Ok(*spl_token::state::unpack(&mut info.data.borrow_mut())
-            .map_err(|_| Error::ExpectedToken)?)
+        spl_token::state::Mint::unpack_from_slice(&info.data.borrow_mut())
+            .map_err(|_| Error::ExpectedAccount)
+
+        // Ok(*spl_token::state::unpack(&mut info.data.borrow_mut())
+        //     .map_err(|_| Error::ExpectedToken)?)
     }
 
     /// Calculates the authority id by generating a program address.

diff --git a/token/cli/src/main.rs b/token/cli/src/main.rs
@@ -20,7 +20,8 @@ use spl_token::{
     self,
     instruction::*,
     native_mint,
-    state::{self, Account, Mint},
+    pack::Pack,
+    state::{Account, Mint},
 };
 use std::{mem::size_of, process::exit};
 
@@ -218,9 +219,8 @@ fn command_burn(config: &Config, source: Pubkey, ui_amount: f64) -> CommmandResu
         .get_account_with_commitment(&source, config.commitment_config)?
         .value
         .unwrap_or_default();
-    let mut data = source_account.data.to_vec();
-    let mint_pubkey = state::unpack::<Account>(&mut data)?.mint;
-
+    let data = source_account.data.to_vec();
+    let mint_pubkey = Account::unpack_from_slice(&data)?.mint;
     let amount = spl_token::ui_amount_to_amount(ui_amount, source_token_balance.decimals);
     let mut transaction = Transaction::new_with_payer(
         &[burn(

diff --git a/token/program/Cargo.toml b/token/program/Cargo.toml
@@ -23,6 +23,8 @@ num-traits = "0.2"
 remove_dir_all = "=0.5.0"
 solana-sdk = { version = "1.3.4", default-features = false, optional = true }
 thiserror = "1.0"
+arrayref = "0.3.6"
+num_enum = "0.5.1"
 
 [dev-dependencies]
 rand = { version = "0.7.0"}