From 799676863b631fb688fefe469450744bf405833f Mon Sep 17 00:00:00 2001
From: Hardhat Chad <hardhatchad@gmail.com>
Date: Fri, 27 Sep 2024 04:42:00 +0000
Subject: [PATCH] bump steel verison

---
 Cargo.lock                |  2 +-
 program/src/initialize.rs | 26 +++++++-------------------
 program/src/open.rs       |  9 +++------
 3 files changed, 11 insertions(+), 26 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 06734de..5ee7aae 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2211,7 +2211,7 @@ checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
 
 [[package]]
 name = "steel"
-version = "1.1.0"
+version = "1.2.0"
 dependencies = [
  "bytemuck",
  "num_enum",
diff --git a/program/src/initialize.rs b/program/src/initialize.rs
index d331c14..b17a8eb 100644
--- a/program/src/initialize.rs
+++ b/program/src/initialize.rs
@@ -1,5 +1,3 @@
-use std::mem::size_of;
-
 use ore_api::{
     consts::*,
     instruction::*,
@@ -91,17 +89,14 @@ pub fn process_initialize(accounts: &[AccountInfo<'_>], data: &[u8]) -> ProgramR
         args.bus_7_bump,
     ];
     for i in 0..BUS_COUNT {
-        create_pda(
+        create_account::<Bus>(
             bus_infos[i],
             &ore_api::id(),
-            8 + size_of::<Bus>(),
             &[BUS, &[i as u8], &[bus_bumps[i]]],
             system_program,
             signer_info,
         )?;
-        let mut bus_data = bus_infos[i].try_borrow_mut_data()?;
-        bus_data[0] = Bus::discriminator() as u8;
-        let bus = Bus::try_from_bytes_mut(&mut bus_data)?;
+        let bus = bus_infos[i].to_account_mut::<Bus>(&ore_api::ID)?;
         bus.id = i as u64;
         bus.rewards = 0;
         bus.theoretical_rewards = 0;
@@ -109,37 +104,30 @@ pub fn process_initialize(accounts: &[AccountInfo<'_>], data: &[u8]) -> ProgramR
     }
 
     // Initialize config.
-    create_pda(
+    create_account::<Config>(
         config_info,
         &ore_api::id(),
-        8 + size_of::<Config>(),
         &[CONFIG, &[args.config_bump]],
         system_program,
         signer_info,
     )?;
-    let mut config_data = config_info.data.borrow_mut();
-    config_data[0] = Config::discriminator() as u8;
-    let config = Config::try_from_bytes_mut(&mut config_data)?;
+    let config = config_info.to_account_mut::<Config>(&ore_api::ID)?;
     config.base_reward_rate = INITIAL_BASE_REWARD_RATE;
     config.last_reset_at = 0;
     config.min_difficulty = INITIAL_MIN_DIFFICULTY as u64;
     config.top_balance = 0;
 
     // Initialize treasury.
-    create_pda(
+    create_account::<Treasury>(
         treasury_info,
         &ore_api::id(),
-        8 + size_of::<Treasury>(),
         &[TREASURY, &[args.treasury_bump]],
         system_program,
         signer_info,
     )?;
-    let mut treasury_data = treasury_info.data.borrow_mut();
-    treasury_data[0] = Treasury::discriminator() as u8;
-    drop(treasury_data);
 
     // Initialize mint.
-    create_pda(
+    allocate_account(
         mint_info,
         &spl_token::id(),
         Mint::LEN,
@@ -191,7 +179,7 @@ pub fn process_initialize(accounts: &[AccountInfo<'_>], data: &[u8]) -> ProgramR
     .invoke_signed(&[&[TREASURY, &[args.treasury_bump]]])?;
 
     // Initialize treasury token account.
-    create_ata(
+    create_associated_token_account(
         signer_info,
         treasury_info,
         treasury_tokens_info,
diff --git a/program/src/open.rs b/program/src/open.rs
index a89dbea..ceee168 100644
--- a/program/src/open.rs
+++ b/program/src/open.rs
@@ -34,18 +34,15 @@ pub fn process_open(accounts: &[AccountInfo<'_>], data: &[u8]) -> ProgramResult
     slot_hashes_info.is_sysvar(&sysvar::slot_hashes::ID)?;
 
     // Initialize proof.
-    create_pda(
+    create_account::<Proof>(
         proof_info,
-        &ore_api::id(),
-        8 + size_of::<Proof>(),
+        &ore_api::ID,
         &[PROOF, signer_info.key.as_ref(), &[args.bump]],
         system_program,
         payer_info,
     )?;
     let clock = Clock::get().or(Err(ProgramError::InvalidAccountData))?;
-    let mut proof_data = proof_info.data.borrow_mut();
-    proof_data[0] = Proof::discriminator() as u8;
-    let proof = Proof::try_from_bytes_mut(&mut proof_data)?;
+    let proof = proof_info.to_account_mut::<Proof>(&ore_api::ID)?;
     proof.authority = *signer_info.key;
     proof.balance = 0;
     proof.challenge = hashv(&[