Merge pull request #84 from regolith-labs/hardhat/v2

Merge v2 branch into master

Cargo.toml

@@ -12,7 +12,7 @@ path = "src/main.rs"
 [features]
 default = []
 admin = []
-gpu = ["drillx/gpu"]
+# gpu = ["drillx/gpu"]
 
 [dependencies]
 bincode = "1.3.3"
@@ -21,10 +21,12 @@ bytemuck = "1.15.0"
 cached = "0.46.1"
 chrono = "0.4.38"
 clap = { version = "4.4.12", features = ["derive"] }
-drillx = { path = "../drillx/drillx", optional = false }
+colored = "2.0"
+drillx = { git = "https://github.com/regolith-labs/drillx", branch = "master", features = ["solana"] }
 futures = "0.3.30"
 num_cpus = "1.16.0"
-ore = { path = "../ore", package = "ore-program" }
+ore-api = { git = "https://github.com/regolith-labs/ore", rev = "ce9a701" }
+ore-utils = { git = "https://github.com/regolith-labs/ore", rev = "ce9a701" }
 rand = "0.8.4"
 solana-cli-config = "^1.18"
 solana-client = "^1.18"

src/args.rs

@@ -45,18 +45,22 @@ pub struct ClaimArgs {
 #[derive(Parser, Debug)]
 pub struct CloseArgs {}
 
+#[cfg(feature = "admin")]
+#[derive(Parser, Debug)]
+pub struct PauseArgs {}
+
 #[cfg(feature = "admin")]
 #[derive(Parser, Debug)]
 pub struct InitializeArgs {}
 
-#[cfg(not(feature = "gpu"))]
 #[derive(Parser, Debug)]
 pub struct MineArgs {
+    // #[cfg(not(feature = "gpu"))]
     #[arg(
         long,
         short,
         value_name = "THREAD_COUNT",
-        help = "The number of threads to dedicate to mining",
+        help = "The number of CPU threads to allocate to mining",
         default_value = "1"
     )]
     pub threads: u64,
@@ -65,30 +69,8 @@ pub struct MineArgs {
         long,
         short,
         value_name = "SECONDS",
-        help = "The number seconds before liveness penalty deadline to stop mining and start submitting",
-        default_value = "10"
-    )]
-    pub buffer_time: u64,
-}
-
-#[cfg(feature = "gpu")]
-#[derive(Parser, Debug)]
-pub struct MineArgs {
-    #[arg(
-        long,
-        short,
-        value_name = "kHZ",
-        help = "The clock rate of your gpu device",
-        default_value = "1800000"
-    )]
-    pub clockrate: u64,
-
-    #[arg(
-        long,
-        short,
-        value_name = "SECONDS",
-        help = "The number seconds before liveness penalty deadline to stop mining and start submitting",
-        default_value = "10"
+        help = "The number seconds before the deadline to stop mining and start submitting",
+        default_value = "5"
     )]
     pub buffer_time: u64,
 }

src/balance.rs

@@ -25,7 +25,7 @@ impl Miner {
         let proof = get_proof(&self.rpc_client, address).await;
         let token_account_address = spl_associated_token_account::get_associated_token_address(
             &address,
-            &ore::MINT_ADDRESS,
+            &ore_api::consts::MINT_ADDRESS,
         );
         let token_balance = if let Ok(Some(token_account)) = self
             .rpc_client

src/busses.rs

@@ -1,4 +1,8 @@
-use ore::{state::Bus, utils::AccountDeserialize, BUS_ADDRESSES, TOKEN_DECIMALS};
+use ore_api::{
+    consts::{BUS_ADDRESSES, TOKEN_DECIMALS},
+    state::Bus,
+};
+use ore_utils::AccountDeserialize;
 
 use crate::Miner;