account_info utilities (#7666)

sdk/src/account.rs

@@ -134,8 +134,8 @@ impl<'a> KeyedAccount<'a> {
         self.is_writable
     }
 
-    pub fn new(key: &'a Pubkey, is_signer: bool, account: &'a mut Account) -> KeyedAccount<'a> {
-        KeyedAccount {
+    pub fn new(key: &'a Pubkey, is_signer: bool, account: &'a mut Account) -> Self {
+        Self {
             is_signer,
             is_writable: true,
             key,
@@ -143,12 +143,8 @@ impl<'a> KeyedAccount<'a> {
         }
     }
 
-    pub fn new_readonly(
-        key: &'a Pubkey,
-        is_signer: bool,
-        account: &'a mut Account,
-    ) -> KeyedAccount<'a> {
-        KeyedAccount {
+    pub fn new_readonly(key: &'a Pubkey, is_signer: bool, account: &'a mut Account) -> Self {
+        Self {
             is_signer,
             is_writable: false,
             key,
@@ -159,7 +155,7 @@ impl<'a> KeyedAccount<'a> {
 
 impl<'a> From<(&'a Pubkey, &'a mut Account)> for KeyedAccount<'a> {
     fn from((key, account): (&'a Pubkey, &'a mut Account)) -> Self {
-        KeyedAccount {
+        Self {
             is_signer: false,
             is_writable: true,
             key,
@@ -170,7 +166,7 @@ impl<'a> From<(&'a Pubkey, &'a mut Account)> for KeyedAccount<'a> {
 
 impl<'a> From<(&'a Pubkey, bool, &'a mut Account)> for KeyedAccount<'a> {
     fn from((key, is_signer, account): (&'a Pubkey, bool, &'a mut Account)) -> Self {
-        KeyedAccount {
+        Self {
             is_signer,
             is_writable: true,
             key,
@@ -181,7 +177,7 @@ impl<'a> From<(&'a Pubkey, bool, &'a mut Account)> for KeyedAccount<'a> {
 
 impl<'a> From<&'a mut (Pubkey, Account)> for KeyedAccount<'a> {
     fn from((key, account): &'a mut (Pubkey, Account)) -> Self {
-        KeyedAccount {
+        Self {
             is_signer: false,
             is_writable: true,
             key,

sdk/src/account_info.rs

@@ -1,11 +1,12 @@
-use crate::pubkey::Pubkey;
+use crate::{account::Account, pubkey::Pubkey};
+
 use std::{cmp, fmt};
 
 /// AccountInfo
 pub struct AccountInfo<'a> {
     /// Public key of the account
     pub key: &'a Pubkey,
-    /// Public key of the account
+    /// Was the transaction signed by this account's public key?
     pub is_signer: bool,
     /// Number of lamports owned by this account
     pub lamports: &'a mut u64,
@@ -35,6 +36,34 @@ impl<'a> fmt::Debug for AccountInfo<'a> {
 }
 
 impl<'a> AccountInfo<'a> {
+    pub fn signer_key(&self) -> Option<&Pubkey> {
+        if self.is_signer {
+            Some(self.key)
+        } else {
+            None
+        }
+    }
+
+    pub fn unsigned_key(&self) -> &Pubkey {
+        self.key
+    }
+
+    pub fn new(
+        key: &'a Pubkey,
+        is_signer: bool,
+        lamports: &'a mut u64,
+        data: &'a mut [u8],
+        owner: &'a Pubkey,
+    ) -> Self {
+        Self {
+            key,
+            is_signer,
+            lamports,
+            data,
+            owner,
+        }
+    }
+
     pub fn deserialize_data<T: serde::de::DeserializeOwned>(&self) -> Result<T, bincode::Error> {
         bincode::deserialize(&self.data)
     }
@@ -46,3 +75,58 @@ impl<'a> AccountInfo<'a> {
         bincode::serialize_into(&mut self.data[..], state)
     }
 }
+
+impl<'a> From<(&'a Pubkey, &'a mut Account)> for AccountInfo<'a> {
+    fn from((key, account): (&'a Pubkey, &'a mut Account)) -> Self {
+        Self {
+            key,
+            is_signer: false,
+            lamports: &mut account.lamports,
+            data: &mut account.data,
+            owner: &account.owner,
+        }
+    }
+}
+
+impl<'a> From<(&'a Pubkey, bool, &'a mut Account)> for AccountInfo<'a> {
+    fn from((key, is_signer, account): (&'a Pubkey, bool, &'a mut Account)) -> Self {
+        Self {
+            key,
+            is_signer,
+            lamports: &mut account.lamports,
+            data: &mut account.data,
+            owner: &account.owner,
+        }
+    }
+}
+
+impl<'a> From<&'a mut (Pubkey, Account)> for AccountInfo<'a> {
+    fn from((key, account): &'a mut (Pubkey, Account)) -> Self {
+        Self {
+            key,
+            is_signer: false,
+            lamports: &mut account.lamports,
+            data: &mut account.data,
+            owner: &account.owner,
+        }
+    }
+}
+
+pub fn create_account_infos(accounts: &mut [(Pubkey, Account)]) -> Vec<AccountInfo> {
+    accounts.iter_mut().map(Into::into).collect()
+}
+
+pub fn create_is_signer_account_infos<'a>(
+    accounts: &'a mut [(&'a Pubkey, bool, &'a mut Account)],
+) -> Vec<AccountInfo<'a>> {
+    accounts
+        .iter_mut()
+        .map(|(key, is_signer, account)| AccountInfo {
+            key,
+            is_signer: *is_signer,
+            lamports: &mut account.lamports,
+            data: &mut account.data,
+            owner: &account.owner,
+        })
+        .collect()
+}