No mining on macos for now.

btdex · Mar 21, 2021 · b006717 · b006717
1 parent dba4385
commit b006717
Showing 3 changed files with 13 additions and 12 deletions.
diff --git a/src/main/java/btdex/ui/Main.java b/src/main/java/btdex/ui/Main.java
@@ -71,6 +71,8 @@
 public class Main extends JFrame implements ActionListener {
 
 	private static final long serialVersionUID = 1L;
+
+	public static String OS = System.getProperty("os.name").toLowerCase();
 
 	private Image icon, iconMono;
 	private Icon ICON_CONNECTED, ICON_DISCONNECTED, ICON_TESTNET;
@@ -222,7 +224,8 @@ public void stateChanged(ChangeEvent evt) {
 
 		tabbedPane.addTab(tr("main_swaps"), i.get(Icons.SWAPS), orderBookToken);
 		tabbedPane.addTab(tr("main_contracts"), i.get(Icons.CROSS_CHAIN), orderBook);
-		tabbedPane.addTab(tr("main_mining"), i.get(Icons.MINING), miningPanel = new MiningPanel());
+		if(!OS.contains("mac"))
+			tabbedPane.addTab(tr("main_mining"), i.get(Icons.MINING), miningPanel = new MiningPanel());
 
 		boolean isMediator = g.getAddress()!=null && g.getMediators().isMediator(g.getAddress().getSignedLongId());
 

diff --git a/src/main/java/btdex/ui/MiningPanel.java b/src/main/java/btdex/ui/MiningPanel.java
@@ -22,7 +22,6 @@
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.StandardCopyOption;
-import java.text.NumberFormat;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
@@ -72,13 +71,10 @@
 public class MiningPanel extends JPanel implements ActionListener, ChangeListener {
 	private static final long serialVersionUID = 1L;
 
-	private static final NumberFormat NF = NumberFormat.getNumberInstance();
-
 	private static final int N_PATHS = 4;
 	private static final long ONE_GIB = 1073741824L;
 	private static final long BYTES_OF_A_NONCE = 262144L;
 
-	private static String OS = System.getProperty("os.name").toLowerCase();
 	private static String TMP_DIR = System.getProperty("java.io.tmpdir");
 
 	private static final String PROP_PLOT_PATH = "plotPath";
@@ -561,7 +557,8 @@ public void update() {
 			double networkTbs = 18325193796.0/miningInfo.getBaseTarget()/1.83;
 			BurstValue burstPerTbPerDay = BurstValue.fromBurst(360.0/networkTbs * latestBlock.getBlockReward().doubleValue());
 
-			String rewards = NumberFormatting.BURST_2.format(burstPerTbPerDay.longValue()) + " BURST";
+			String rewards = tr("mine_reward_estimation_old", NumberFormatting.BURST_2.format(burstPerTbPerDay.longValue()),
+					formatSpace(networkTbs*1024L*ONE_GIB));
 			BurstValue avgCommitment = null;
 			if(miningInfo.getAverageCommitmentNQT() > 0) {
 				avgCommitment = BurstValue.fromPlanck(miningInfo.getAverageCommitmentNQT());
@@ -833,10 +830,10 @@ public void stateChanged(ChangeEvent e) {
 	public String formatSpace(double bytes) {
 		bytes /= ONE_GIB;
 		if(bytes < 500) {
-		    return NF.format(bytes) + " GiB";
+		    return NumberFormatting.BURST_2.format(bytes) + " GiB";
 		}
 		bytes /= 1024;
-	    return NF.format(bytes) + " TiB";
+	    return NumberFormatting.BURST_2.format(bytes) + " TiB";
 	}
 
 	private void startPlotting() {
@@ -897,14 +894,14 @@ private void startPlotting() {
 
 
 		String engraverName = "engraver_cpu";
-		if(OS.contains("win"))
+		if(Main.OS.contains("win"))
 			engraverName += ".exe";
 		plotterFile = new File(TMP_DIR, engraverName);
 		if (!plotterFile.exists() || plotterFile.length() == 0) {
 		     InputStream link = (getClass().getResourceAsStream("/engraver/" + engraverName));
 		     try {
 				Files.copy(link, plotterFile.getAbsoluteFile().toPath());
-				if(!OS.contains("win"))
+				if(!Main.OS.contains("win"))
 					plotterFile.setExecutable(true);
 			} catch (IOException ex) {
 				ex.printStackTrace();
@@ -1085,7 +1082,7 @@ private void startMining() {
 		stopMiningButton.setEnabled(true);
 
 		String minerName = "scavenger";
-		if(OS.contains("win"))
+		if(Main.OS.contains("win"))
 			minerName += ".exe";
 		minerFile = new File(TMP_DIR, minerName);
 		InputStream minerStream = (getClass().getResourceAsStream("/scavenger/" + minerName));
@@ -1095,7 +1092,7 @@ private void startMining() {
 				minerFile.delete();
 
 			Files.copy(minerStream, minerFile.getAbsoluteFile().toPath());
-			if(!OS.contains("win"))
+			if(!Main.OS.contains("win"))
 				minerFile.setExecutable(true);
 
 			FileWriter minerConfig = new FileWriter(minerFile.getParent() + "/" + MINER_CONFIG_FILE);

diff --git a/src/main/resources/locale/i18n.btdex.properties b/src/main/resources/locale/i18n.btdex.properties
@@ -338,6 +338,7 @@ mine_run_miner = Step 3. Run miner
 mine_rewards_and_commitment = Daily rewards estimation per TiB
 mine_already_joined = All set, you can already mine on this pool.
 mine_wait_join = You just joined a new pool, wait for 4 blocks.
+mine_reward_estimation_old = {0} BURST with the current total network of {1}
 mine_reward_estimation = {0} BURST with {1} BURST/TiB committed
 mine_reward_estimation_nothing = {0} BURST with nothing committed
 mine_your_rewards = With {0} you should get {1} BURST/day