Merge pull request #142 from btdex/master

Make it up-to-date
btdex · Mar 29, 2021 · 7e9cf3a · 7e9cf3a
2 parents 75c4731 + 6559491
commit 7e9cf3a
Show file tree

Hide file tree

Showing 28 changed files with 1,663 additions and 284 deletions.
diff --git a/build.gradle b/build.gradle
@@ -25,11 +25,11 @@ repositories {
 
 dependencies {
     // implementation 'com.github.burst-apps-team:burstkit4j:0.16.1'
-    implementation 'com.github.burst-apps-team:burstkit4j:5518e044c4'
+    implementation 'com.github.burst-apps-team:burstkit4j:0a760efbdd'
     // implementation 'com.github.jjos2372:burstkit4j:a5ee32342f'
 
-    //implementation 'com.github.jjos2372:blocktalk:-SNAPSHOT'
-    implementation 'com.github.jjos2372:blocktalk:3337bfbf32'
+    // implementation 'com.github.jjos2372:blocktalk:183bf6861e'
+    implementation 'com.github.burst-apps-team:blocktalk:183bf6861e'    
 
     implementation 'com.google.code.gson:gson:2.8.6'
     implementation 'io.reactivex.rxjava2:rxjava:2.2.15'
@@ -38,9 +38,14 @@ dependencies {
     implementation 'com.github.jiconfont:jiconfont-swing:1.0.0'
     //implementation 'com.github.jiconfont:jiconfont-font_awesome:4.7.0.1'
     implementation 'com.github.meisenla:jiconfont-font_awesome:8be36e8ba9'
+
+    //implementation 'net.java.dev.jna:jna-platform:5.7.0'
+    //implementation 'net.java.dev.jna:jna:5.7.0'
 
 	//implementation 'com.github.weisj:darklaf-core:[1.4.3.1,)'
     implementation 'com.bulenkov:darcula:2018.2'
+
+    implementation 'com.dorkbox:SystemTray:3.17'
 
     implementation 'org.apache.commons:commons-text:1.8'
 

diff --git a/src/main/java/btdex/api/Server.java b/src/main/java/btdex/api/Server.java
@@ -33,7 +33,7 @@
  *
  */
 public class Server extends NanoHTTPD {
-    private static final Logger logger = LogManager.getLogger();;
+    private static final Logger logger = LogManager.getLogger();
 
     private static final String API_PREFIX = "/api/v1/";
 

diff --git a/src/main/java/btdex/core/BurstNode.java b/src/main/java/btdex/core/BurstNode.java
@@ -4,6 +4,7 @@
 import java.util.HashMap;
 import java.util.Timer;
 import java.util.TimerTask;
+import java.util.concurrent.atomic.AtomicReference;
 
 import btdex.markets.MarketTRT;
 import burst.kit.entity.BurstAddress;
@@ -15,6 +16,7 @@
 import burst.kit.entity.response.AssetTrade;
 import burst.kit.entity.response.Block;
 import burst.kit.entity.response.FeeSuggestion;
+import burst.kit.entity.response.MiningInfo;
 import burst.kit.entity.response.Transaction;
 import burst.kit.service.BurstNodeService;
 
@@ -52,8 +54,9 @@ public class BurstNode {
 	private Transaction[] utxs;
 	private Block checkBlock;
 	private Exception nodeError;
-	private Account account;
-	private BurstAddress rewardRecipient;
+	private AtomicReference<MiningInfo> miningInfo = new AtomicReference<>();
+	private AtomicReference<Account> account = new AtomicReference<>();
+	private AtomicReference<BurstAddress> rewardRecipient = new AtomicReference<>();
 	private FeeSuggestion suggestedFee;
 	private BurstID lastBlock;
 	private Block latestBlock;
@@ -128,11 +131,15 @@ public Transaction[] getUnconfirmedTransactions() {
 	}
 
 	public Account getAccount() {
-		return account;
+		return account.get();
+	}
+
+	public MiningInfo getMiningInfo() {
+		return miningInfo.get();
 	}
 
 	public BurstAddress getRewardRecipient() {
-		return rewardRecipient;
+		return rewardRecipient.get();
 	}
 
 	public Exception getNodeException() {
@@ -160,6 +167,7 @@ public void update() {
 
 	private class NodeUpdateTask extends TimerTask {
 
+
 		@Override
 		public void run() {
 			Globals g = Globals.getInstance();
@@ -260,8 +268,15 @@ public void run() {
 					checkBlock = NS.getBlock(Constants.CHECK_HEIGHT).blockingGet();
 				}
 				try {
-					account = NS.getAccount(g.getAddress()).blockingGet();
-					rewardRecipient = NS.getRewardRecipient(g.getAddress()).blockingGet();
+					miningInfo.set(NS.getMiningInfo().blockingFirst());
+					rewardRecipient.set(NS.getRewardRecipient(g.getAddress()).blockingGet());
+					Boolean getCommitmentStats = null;
+					if(miningInfo.get().getAverageCommitmentNQT() > 0) {
+						// Only request commitment stats if there is support on the node
+						getCommitmentStats = Boolean.TRUE;
+					}
+
+					account.set(NS.getAccount(g.getAddress(), null, getCommitmentStats, getCommitmentStats).blockingGet());
 				}
 				catch (Exception e) {
 					nodeError = e;

diff --git a/src/main/java/btdex/core/Globals.java b/src/main/java/btdex/core/Globals.java
@@ -398,6 +398,14 @@ public void setNode(String node) {
 
 		NS = BurstNodeService.getInstance(node);
 	}
+
+	public void setProperty(String key, String value) {
+		conf.setProperty(key, value);
+	}
+
+	public String getProperty(String key) {
+		return conf.getProperty(key);
+	}
 
 	public String getExplorer() {
 		return conf.getProperty(Constants.PROP_EXPLORER, ExplorerWrapper.BURSTCOIN_NETWORK);

diff --git a/src/main/java/btdex/core/NumberFormatting.java b/src/main/java/btdex/core/NumberFormatting.java
@@ -52,6 +52,9 @@ public String format(double dvalue) {
     // Minimum of 5 decimal places
     public static final NumberFormatting BURST = NF(2, 8);
 
+    // Max of 2 decimal places
+    public static final NumberFormatting BURST_2 = NF(2, 2);
+
     // Minimum of 2 decimal places, max 4
     public static final NumberFormatting TOKEN = NF(2, 4);
 

diff --git a/src/main/java/btdex/ui/ClipboardAndQRButton.java b/src/main/java/btdex/ui/ClipboardAndQRButton.java
@@ -25,19 +25,21 @@ public class ClipboardAndQRButton extends JPanel {
 	private static final long serialVersionUID = 1L;
 
 	private String uri;
+
+	private JLabel copyButton;
 
 	public ClipboardAndQRButton(final Component parent, int iconSize, final Color fg) {
 		super(new FlowLayout(FlowLayout.LEFT));
 		this.setAlignmentY(0.65f);
 
-		JLabel copyButton = new JLabel(IconFontSwing.buildIcon(FontAwesome.CLONE, iconSize, fg));
+		copyButton = new JLabel(IconFontSwing.buildIcon(FontAwesome.CLONE, iconSize, fg));
 		JLabel qrButton = new JLabel(IconFontSwing.buildIcon(FontAwesome.QRCODE, iconSize, fg));
 
 		copyButton.setToolTipText(tr("btn_copy_to_clipboard"));
 		qrButton.setToolTipText(tr("btn_show_qr"));
 
-		add(copyButton);
 		add(qrButton);
+		add(copyButton);
 
 		copyButton.addMouseListener(new MouseAdapter() {
 			@Override
@@ -74,5 +76,6 @@ public void setURI(String uri) {
 		// TODO: more elaborated URI as described for instance here:
 		// https://github.com/bitcoin/bips/blob/master/bip-0021.mediawiki
 		this.uri = uri;
+		copyButton.setText(uri);
 	}
 }
diff --git a/src/main/java/btdex/ui/DesktopApi.java b/src/main/java/btdex/ui/DesktopApi.java
@@ -7,15 +7,18 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
 /**
  * Code from https://stackoverflow.com/questions/18004150/desktop-api-is-not-supported-on-the-current-platform/18004334#18004334
  *
  * net.mightypork.rpack.utils
  * 
- * FIXME: disabled logging for now, this needs to be improved 
- * 
  */
 public class DesktopApi {
+
+    private static final Logger logger = LogManager.getLogger();
 
     public static boolean browse(URI uri) {
 
@@ -152,7 +155,7 @@ private static boolean editDESKTOP(File file) {
 
     private static boolean runCommand(String command, String args, String file) {
 
-        logOut("Trying to exec:\n   cmd = " + command + "\n   args = " + args + "\n   %s = " + file);
+        logOut("Trying to exec:   cmd = " + command + "   args = " + args + "   %s = " + file);
 
         String[] parts = prepareCommand(command, args, file);
 
@@ -206,7 +209,7 @@ private static void logErr(String msg) {
     }
 
     private static void logOut(String msg) {
-        System.out.println(msg);
+        logger.debug(msg);
     }
 
     public static enum EnumOS {

diff --git a/src/main/java/btdex/ui/Icons.java b/src/main/java/btdex/ui/Icons.java
@@ -53,6 +53,7 @@ public class Icons {
     public static IconCode NEW_TOKEN = FontAwesome.TAG;
     public static IconCode UP = FontAwesome.ARROW_UP;
     public static IconCode DOWN = FontAwesome.ARROW_DOWN;
+    public static IconCode QUIT = FontAwesome.POWER_OFF;
     public static IconCode UNKNOWN = FontAwesome.QUESTION;
 
     public static IconCode DISCORD = FontAwesomeBrands.DISCORD;