Update dependencies

Author: febo

Cargo.lock

@@ -23,7 +23,8 @@ pinocchio = { version = "0.9", path = "sdk/pinocchio" }
 pinocchio-log-macro = { version = "0.5", path = "sdk/log/macro" }
 quote = "1.0"
 regex = "1"
-solana-address = { version = "1.0", git = "https://github.com/febo/solana-sdk.git", branch = "derive-address" }
+solana-account-view = { version = "0.0.0", git = "https://github.com/febo/solana-sdk.git", branch = "solana-account-view" }
+solana-address = { version = "1.0", git = "https://github.com/febo/solana-sdk.git", branch = "solana-account-view" }
 syn = "1.0"
 
 [workspace.metadata.cli]

Cargo.toml

@@ -1,7 +1,7 @@
 use core::mem::MaybeUninit;
 
 use pinocchio::{
-    account_info::AccountInfo,
+    account_view::AccountView,
     cpi::{slice_invoke_signed, MAX_CPI_ACCOUNTS},
     instruction::{AccountMeta, Instruction, Signer},
     program_error::ProgramError,
@@ -14,7 +14,7 @@ use pinocchio::{
 ///   0. `..+N` `[SIGNER]` N signing accounts
 pub struct Memo<'a, 'b, 'c> {
     /// Signing accounts
-    pub signers: &'b [&'a AccountInfo],
+    pub signers: &'b [&'a AccountView],
     /// Memo
     pub memo: &'c str,
 }

programs/memo/src/instructions/mod.rs

@@ -33,9 +33,9 @@ pub struct CreateAccount<'a> {
 impl<'a> CreateAccount<'a> {
     #[inline(always)]
     pub fn with_minimal_balance(
-        from: &'a AccountInfo,
-        to: &'a AccountInfo,
-        rent_sysvar: &'a AccountInfo,
+        from: &'a AccountView,
+        to: &'a AccountView,
+        rent_sysvar: &'a AccountView,
         space: u64,
         owner: &'a Address,
     ) -> Result<Self, ProgramError> {

programs/system/src/instructions/create_account.rs

@@ -45,11 +45,11 @@ pub struct CreateAccountWithSeed<'a, 'b, 'c> {
 impl<'a, 'b, 'c> CreateAccountWithSeed<'a, 'b, 'c> {
     #[inline(always)]
     pub fn with_minimal_balance(
-        from: &'a AccountInfo,
-        to: &'a AccountInfo,
-        base: Option<&'a AccountInfo>,
+        from: &'a AccountView,
+        to: &'a AccountView,
+        base: Option<&'a AccountView>,
         seed: &'b str,
-        rent_sysvar: &'a AccountInfo,
+        rent_sysvar: &'a AccountView,
         space: u64,
         owner: &'c Address,
     ) -> Result<Self, ProgramError> {

programs/system/src/instructions/create_account_with_seed.rs

@@ -1,7 +1,7 @@
 use core::slice::from_raw_parts;
 
 use pinocchio::{
-    account_info::AccountInfo,
+    account_view::AccountView,
     address::Address,
     instruction::{AccountMeta, Instruction, Signer},
     program::invoke_signed,
@@ -18,11 +18,11 @@ use crate::{write_bytes, UNINIT_BYTE};
 ///   2. `[SIGNER]` The source account owner.
 pub struct Approve<'a, 'b> {
     /// Source Account.
-    pub source: &'a AccountInfo,
+    pub source: &'a AccountView,
     /// Delegate Account
-    pub delegate: &'a AccountInfo,
+    pub delegate: &'a AccountView,
     /// Source Owner Account
-    pub authority: &'a AccountInfo,
+    pub authority: &'a AccountView,
     /// Amount
     pub amount: u64,
     /// Token Program

programs/token-2022/src/instructions/approve.rs

@@ -1,7 +1,7 @@
 use core::slice::from_raw_parts;
 
 use pinocchio::{
-    account_info::AccountInfo,
+    account_view::AccountView,
     address::Address,
     instruction::{AccountMeta, Instruction, Signer},
     program::invoke_signed,
@@ -19,13 +19,13 @@ use crate::{write_bytes, UNINIT_BYTE};
 ///   3. `[SIGNER]` The source account owner.
 pub struct ApproveChecked<'a, 'b> {
     /// Source Account.
-    pub source: &'a AccountInfo,
+    pub source: &'a AccountView,
     /// Mint Account.
-    pub mint: &'a AccountInfo,
+    pub mint: &'a AccountView,
     /// Delegate Account.
-    pub delegate: &'a AccountInfo,
+    pub delegate: &'a AccountView,
     /// Source Owner Account.
-    pub authority: &'a AccountInfo,
+    pub authority: &'a AccountView,
     /// Amount.
     pub amount: u64,
     /// Decimals.

programs/token-2022/src/instructions/approve_checked.rs

@@ -1,7 +1,7 @@
 use core::slice::from_raw_parts;
 
 use pinocchio::{
-    account_info::AccountInfo,
+    account_view::AccountView,
     address::Address,
     instruction::{AccountMeta, Instruction, Signer},
     program::invoke_signed,
@@ -18,11 +18,11 @@ use crate::{write_bytes, UNINIT_BYTE};
 ///   2. `[SIGNER]` The account's owner/delegate.
 pub struct Burn<'a, 'b> {
     /// Source of the Burn Account
-    pub account: &'a AccountInfo,
+    pub account: &'a AccountView,
     /// Mint Account
-    pub mint: &'a AccountInfo,
+    pub mint: &'a AccountView,
     /// Owner of the Token Account
-    pub authority: &'a AccountInfo,
+    pub authority: &'a AccountView,
     /// Amount
     pub amount: u64,
     /// Token Program

programs/token-2022/src/instructions/burn.rs

@@ -2,7 +2,7 @@ use core::slice::from_raw_parts;
 
 use crate::{write_bytes, UNINIT_BYTE};
 use pinocchio::{
-    account_info::AccountInfo,
+    account_view::AccountView,
     address::Address,
     instruction::{AccountMeta, Instruction, Signer},
     program::invoke_signed,
@@ -17,11 +17,11 @@ use pinocchio::{
 ///   2. `[SIGNER]` The account's owner/delegate.
 pub struct BurnChecked<'a, 'b> {
     /// Source of the Burn Account
-    pub account: &'a AccountInfo,
+    pub account: &'a AccountView,
     /// Mint Account
-    pub mint: &'a AccountInfo,
+    pub mint: &'a AccountView,
     /// Owner of the Token Account
-    pub authority: &'a AccountInfo,
+    pub authority: &'a AccountView,
     /// Amount
     pub amount: u64,
     /// Decimals

programs/token-2022/src/instructions/burn_checked.rs

@@ -1,5 +1,5 @@
 use pinocchio::{
-    account_info::AccountInfo,
+    account_view::AccountView,
     address::Address,
     instruction::{AccountMeta, Instruction, Signer},
     program::invoke_signed,
@@ -14,11 +14,11 @@ use pinocchio::{
 ///   2. `[SIGNER]` The account's owner.
 pub struct CloseAccount<'a, 'b> {
     /// Token Account.
-    pub account: &'a AccountInfo,
+    pub account: &'a AccountView,
     /// Destination Account
-    pub destination: &'a AccountInfo,
+    pub destination: &'a AccountView,
     /// Owner Account
-    pub authority: &'a AccountInfo,
+    pub authority: &'a AccountView,
     /// Token Program
     pub token_program: &'b Address,
 }