cleanup

api/src/state/config.rs

@@ -1,6 +1,6 @@
 use steel::*;
 
-use crate::state::{config_pda, OreAccountOLD};
+use crate::state::config_pda;
 
 use super::OreAccount;
 
@@ -25,25 +25,6 @@ pub struct Config {
     pub fee_rate: u64,
 }
 
-#[repr(C)]
-#[derive(Clone, Copy, Debug, PartialEq, Pod, Zeroable)]
-pub struct ConfigOLD {
-    // The address that can set the admin.
-    pub admin: Pubkey,
-
-    // The block duration in slots.
-    pub block_duration: u64,
-
-    // The duration in slots for which the sniper fee is applied.
-    pub sniper_fee_duration: u64,
-
-    // The address that receives fees.
-    pub fee_collector: Pubkey,
-
-    // The fee rate taken for each swap.
-    pub fee_rate: u64,
-}
-
 impl Config {
     pub fn pda() -> (Pubkey, u8) {
         config_pda()
@@ -51,4 +32,3 @@ impl Config {
 }
 
 account!(OreAccount, Config);
-account!(OreAccountOLD, ConfigOLD);

api/src/state/miner.rs

@@ -1,6 +1,6 @@
 use steel::*;
 
-use crate::state::{miner_pda, OreAccountOLD};
+use crate::state::miner_pda;
 
 use super::OreAccount;
 
@@ -29,31 +29,6 @@ pub struct Miner {
     pub lifetime_rewards_ore: u64,
 }
 
-#[repr(C)]
-#[derive(Clone, Copy, Debug, PartialEq, Pod, Zeroable)]
-pub struct MinerOLD {
-    /// The authority of this miner account.
-    pub authority: Pubkey,
-
-    /// The ID of the last block this miner mined in.
-    pub block_id: u64,
-
-    /// An account authorized to execute actions on behalf of this miner.
-    pub executor: Pubkey,
-
-    /// The amount of hashpower this miner has committed to the current block.
-    pub hashpower: u64,
-
-    /// A user-supplied seed for random number generation.
-    pub seed: [u8; 32],
-
-    /// The total amount of hashpower this miner has committed across all blocks.
-    pub total_hashpower: u64,
-
-    /// The total amount of ORE this miner has mined across all blocks.
-    pub total_rewards: u64,
-}
-
 impl Miner {
     pub fn pda(&self) -> (Pubkey, u8) {
         miner_pda(self.authority)
@@ -61,4 +36,3 @@ impl Miner {
 }
 
 account!(OreAccount, Miner);
-account!(OreAccountOLD, MinerOLD);

api/src/state/mod.rs

@@ -26,14 +26,6 @@ pub enum OreAccount {
     Square = 106,
 }
 
-#[repr(u8)]
-#[derive(Clone, Copy, Debug, Eq, PartialEq, IntoPrimitive, TryFromPrimitive)]
-pub enum OreAccountOLD {
-    ConfigOLD = 101,
-    MinerOLD = 103,
-    TreasuryOLD = 104,
-}
-
 pub fn board_pda() -> (Pubkey, u8) {
     Pubkey::find_program_address(&[BOARD], &crate::ID)
 }

api/src/state/treasury.rs

@@ -1,6 +1,6 @@
 use steel::*;
 
-use crate::state::{treasury_pda, OreAccountOLD};
+use crate::state::treasury_pda;
 
 use super::OreAccount;
 
@@ -12,17 +12,4 @@ pub struct Treasury {
     pub balance: u64,
 }
 
-/// Treasury is a singleton account which is the mint authority for the ORE token and the authority of
-/// the program's global token account.
-#[repr(C)]
-#[derive(Clone, Copy, Debug, PartialEq, Pod, Zeroable)]
-pub struct TreasuryOLD {}
-
-impl Treasury {
-    pub fn pda() -> (Pubkey, u8) {
-        treasury_pda()
-    }
-}
-
 account!(OreAccount, Treasury);
-account!(OreAccountOLD, TreasuryOLD);