deps: Bump to SDK v4 / address v2 (#133)

#### Problem

The newest SDK crates are out, but the record program isn't using them.

#### Summary of changes

Bump everything to the newest versions. At the same time, switch from
solana-pubkey to solana-address.

Author: joncinque

Cargo.lock

@@ -14,21 +14,22 @@ no-entrypoint = []
 bytemuck = { version = "1.23.1", features = ["derive"] }
 num-derive = "0.4"
 num-traits = "0.2"
-solana-account-info = "3.0.0"
-solana-instruction = { version = "3.0.0", features = ["std"] }
+solana-account-info = "3.1.0"
+solana-address = { version = "2.0.0", features = ["bytemuck", "decode"] }
+solana-instruction = { version = "3.1.0", features = ["std"] }
 solana-msg = "3.0.0"
-solana-program-entrypoint = "3.0.0"
+solana-program-entrypoint = "3.1.0"
 solana-program-error = "3.0.0"
 solana-program-pack = "3.0.0"
-solana-pubkey = { version = "3.0.0", features = ["bytemuck"] }
 solana-rent = "3.0.0"
 solana-security-txt = "1.1.2"
 thiserror = "2.0.12"
 
 [dev-dependencies]
 mollusk-svm = "0.7.0"
-solana-account = "3.0.0"
-solana-system-interface = "2"
+solana-account = "3.1.0"
+solana-address = { version = "2.0.0", features = ["atomic"] }
+solana-system-interface = { version = "3", features = ["bincode"] }
 
 [lib]
 crate-type = ["cdylib", "lib"]

program/Cargo.toml

@@ -3,13 +3,13 @@
 #![cfg(all(target_os = "solana", not(feature = "no-entrypoint")))]
 
 use {
-    solana_account_info::AccountInfo, solana_program_error::ProgramResult, solana_pubkey::Pubkey,
+    solana_account_info::AccountInfo, solana_address::Address, solana_program_error::ProgramResult,
     solana_security_txt::security_txt,
 };
 
 solana_program_entrypoint::entrypoint!(process_instruction);
 fn process_instruction(
-    program_id: &Pubkey,
+    program_id: &Address,
     accounts: &[AccountInfo],
     instruction_data: &[u8],
 ) -> ProgramResult {

program/src/entrypoint.rs

@@ -2,9 +2,9 @@
 
 use {
     crate::id,
+    solana_address::Address,
     solana_instruction::{AccountMeta, Instruction},
     solana_program_error::ProgramError,
-    solana_pubkey::Pubkey,
     std::mem::size_of,
 };
 
@@ -134,7 +134,7 @@ impl<'a> RecordInstruction<'a> {
 }
 
 /// Create a `RecordInstruction::Initialize` instruction
-pub fn initialize(record_account: &Pubkey, authority: &Pubkey) -> Instruction {
+pub fn initialize(record_account: &Address, authority: &Address) -> Instruction {
     Instruction {
         program_id: id(),
         accounts: vec![
@@ -146,7 +146,7 @@ pub fn initialize(record_account: &Pubkey, authority: &Pubkey) -> Instruction {
 }
 
 /// Create a `RecordInstruction::Write` instruction
-pub fn write(record_account: &Pubkey, signer: &Pubkey, offset: u64, data: &[u8]) -> Instruction {
+pub fn write(record_account: &Address, signer: &Address, offset: u64, data: &[u8]) -> Instruction {
     Instruction {
         program_id: id(),
         accounts: vec![
@@ -159,9 +159,9 @@ pub fn write(record_account: &Pubkey, signer: &Pubkey, offset: u64, data: &[u8])
 
 /// Create a `RecordInstruction::SetAuthority` instruction
 pub fn set_authority(
-    record_account: &Pubkey,
-    signer: &Pubkey,
-    new_authority: &Pubkey,
+    record_account: &Address,
+    signer: &Address,
+    new_authority: &Address,
 ) -> Instruction {
     Instruction {
         program_id: id(),
@@ -175,7 +175,11 @@ pub fn set_authority(
 }
 
 /// Create a `RecordInstruction::CloseAccount` instruction
-pub fn close_account(record_account: &Pubkey, signer: &Pubkey, receiver: &Pubkey) -> Instruction {
+pub fn close_account(
+    record_account: &Address,
+    signer: &Address,
+    receiver: &Address,
+) -> Instruction {
     Instruction {
         program_id: id(),
         accounts: vec![
@@ -188,7 +192,7 @@ pub fn close_account(record_account: &Pubkey, signer: &Pubkey, receiver: &Pubkey
 }
 
 /// Create a `RecordInstruction::Reallocate` instruction
-pub fn reallocate(record_account: &Pubkey, signer: &Pubkey, data_length: u64) -> Instruction {
+pub fn reallocate(record_account: &Address, signer: &Address, data_length: u64) -> Instruction {
     Instruction {
         program_id: id(),
         accounts: vec![

program/src/instruction.rs

@@ -10,8 +10,8 @@ pub mod state;
 // Export current SDK types for downstream users building with a different SDK
 // version
 pub use {
-    solana_account_info, solana_instruction, solana_msg, solana_program_entrypoint,
-    solana_program_error, solana_program_pack, solana_pubkey,
+    solana_account_info, solana_address, solana_instruction, solana_msg, solana_program_entrypoint,
+    solana_program_error, solana_program_pack,
 };
 
-solana_pubkey::declare_id!("recr1L3PCGKLbckBqMNcJhuuyU1zgo8nBhfLVsJNwr5");
+solana_address::declare_id!("recr1L3PCGKLbckBqMNcJhuuyU1zgo8nBhfLVsJNwr5");

program/src/lib.rs

@@ -3,13 +3,13 @@
 use {
     crate::{error::RecordError, instruction::RecordInstruction, state::RecordData},
     solana_account_info::{next_account_info, AccountInfo},
+    solana_address::Address,
     solana_msg::msg,
     solana_program_error::{ProgramError, ProgramResult},
     solana_program_pack::IsInitialized,
-    solana_pubkey::Pubkey,
 };
 
-fn check_authority(authority_info: &AccountInfo, expected_authority: &Pubkey) -> ProgramResult {
+fn check_authority(authority_info: &AccountInfo, expected_authority: &Address) -> ProgramResult {
     if expected_authority != authority_info.key {
         msg!("Incorrect record authority provided");
         return Err(RecordError::IncorrectAuthority.into());
@@ -23,7 +23,7 @@ fn check_authority(authority_info: &AccountInfo, expected_authority: &Pubkey) ->
 
 /// Instruction processor
 pub fn process_instruction(
-    _program_id: &Pubkey,
+    _program_id: &Address,
     accounts: &[AccountInfo],
     input: &[u8],
 ) -> ProgramResult {

program/src/processor.rs

@@ -1,8 +1,8 @@
 //! Program state
 use {
     bytemuck::{Pod, Zeroable},
+    solana_address::Address,
     solana_program_pack::IsInitialized,
-    solana_pubkey::Pubkey,
 };
 
 /// Header type for recorded account data
@@ -13,7 +13,7 @@ pub struct RecordData {
     pub version: u8,
 
     /// The account allowed to update the data
-    pub authority: Pubkey,
+    pub authority: Address,
 }
 
 impl RecordData {
@@ -37,20 +37,20 @@ pub(crate) mod tests {
 
     /// Version for tests
     pub const TEST_VERSION: u8 = 1;
-    /// Pubkey for tests
-    pub const TEST_PUBKEY: Pubkey = Pubkey::new_from_array([100; 32]);
+    /// Address for tests
+    pub const TEST_ADDRESS: Address = Address::new_from_array([100; 32]);
     /// Bytes for tests
     pub const TEST_BYTES: [u8; 8] = [42; 8];
     /// `RecordData` for tests
     pub const TEST_RECORD_DATA: RecordData = RecordData {
         version: TEST_VERSION,
-        authority: TEST_PUBKEY,
+        authority: TEST_ADDRESS,
     };
 
     #[test]
     fn serialize_data() {
         let mut expected = vec![TEST_VERSION];
-        expected.extend_from_slice(&TEST_PUBKEY.to_bytes());
+        expected.extend_from_slice(&TEST_ADDRESS.to_bytes());
         assert_eq!(bytemuck::bytes_of(&TEST_RECORD_DATA), expected);
         assert_eq!(
             *bytemuck::try_from_bytes::<RecordData>(&expected).unwrap(),
@@ -61,7 +61,7 @@ pub(crate) mod tests {
     #[test]
     fn deserialize_invalid_slice() {
         let mut expected = vec![TEST_VERSION];
-        expected.extend_from_slice(&TEST_PUBKEY.to_bytes());
+        expected.extend_from_slice(&TEST_ADDRESS.to_bytes());
         expected.extend_from_slice(&TEST_BYTES);
         let err = bytemuck::try_from_bytes::<RecordData>(&expected)
             .map_err(|_| ProgramError::InvalidArgument)