From 96461232165b09bbf599f23d6fd8206f31855333 Mon Sep 17 00:00:00 2001
From: alex <aabinaei@gmail.com>
Date: Sun, 14 Jul 2024 13:09:17 -0700
Subject: [PATCH] Code TLC

---
 api/src/consts.rs | 6 ++----
 api/src/error.rs  | 3 +--
 api/src/lib.rs    | 3 +--
 3 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/api/src/consts.rs b/api/src/consts.rs
index 3d41aba..c22a4d4 100644
--- a/api/src/consts.rs
+++ b/api/src/consts.rs
@@ -6,8 +6,7 @@ use solana_program::{pubkey, pubkey::Pubkey};
 pub const INITIAL_BASE_REWARD_RATE: u64 = 10u64.pow(3u32);
 
 /// The admin allowed to initialize the program.
-// pub const INITIAL_ADMIN: Pubkey = pubkey!("HBUh9g46wk2X89CvaNN15UmsznP59rh6od1h8JwYAopk");
-pub const INITIAL_ADMIN: Pubkey = pubkey!("DEuG4JnzvMVxMFPoBVvf2GH38mn3ybunMxtfmVU3ms86");
+pub const INITIAL_ADMIN: Pubkey = pubkey!("HBUh9g46wk2X89CvaNN15UmsznP59rh6od1h8JwYAopk");
 
 /// The spam/liveness tolerance in seconds.
 pub const TOLERANCE: i64 = 5;
@@ -124,8 +123,7 @@ pub const MINT_ADDRESS: Pubkey =
     Pubkey::new_from_array(ed25519::derive_program_address(&[MINT, &MINT_NOISE], &PROGRAM_ID).0);
 
 /// The address of the v1 mint account.
-// pub const MINT_V1_ADDRESS: Pubkey = pubkey!("oreoN2tQbHXVaZsr3pf66A48miqcBXCDJozganhEJgz");
-pub const MINT_V1_ADDRESS: Pubkey = pubkey!("2Hr9iaAd7a5q9V4XmLHPBtSZcfhff8RBrvaG6zf2bEae");
+pub const MINT_V1_ADDRESS: Pubkey = pubkey!("oreoN2tQbHXVaZsr3pf66A48miqcBXCDJozganhEJgz");
 
 /// The address of the treasury account.
 pub const TREASURY_ADDRESS: Pubkey =
diff --git a/api/src/error.rs b/api/src/error.rs
index 9aa70c4..e3d8ee0 100644
--- a/api/src/error.rs
+++ b/api/src/error.rs
@@ -31,7 +31,6 @@ pub enum OreError {
 
 impl From<OreError> for ProgramError {
     fn from(e: OreError) -> Self {
-        let f = (e as u32) + 300;
-        ProgramError::Custom(f)
+        ProgramError::Custom(e as u32)
     }
 }
diff --git a/api/src/lib.rs b/api/src/lib.rs
index 05b0e90..66c37d9 100644
--- a/api/src/lib.rs
+++ b/api/src/lib.rs
@@ -9,5 +9,4 @@ pub(crate) use ore_utils as utils;
 
 use solana_program::declare_id;
 
-// declare_id!("oreV2ZymfyeXgNgBdqMkumTqqAprVqgBWQfoYkrtKWQ");
-declare_id!("6XpUkLPF2t28er1Mx89ry5QFJ4piDTJZiEFVRRG3HbS7");
+declare_id!("oreV2ZymfyeXgNgBdqMkumTqqAprVqgBWQfoYkrtKWQ");