refactor electrumserver into net package

sparrowwallet · Aug 10, 2020 · bb635a6 · bb635a6
1 parent 7d8774c
commit bb635a6
Show file tree

Hide file tree

Showing 19 changed files with 479 additions and 403 deletions.
diff --git a/src/main/java/com/sparrowwallet/sparrow/AppController.java b/src/main/java/com/sparrowwallet/sparrow/AppController.java
@@ -18,6 +18,7 @@
 import com.sparrowwallet.sparrow.control.*;
 import com.sparrowwallet.sparrow.event.*;
 import com.sparrowwallet.sparrow.io.*;
+import com.sparrowwallet.sparrow.net.ElectrumServer;
 import com.sparrowwallet.sparrow.preferences.PreferencesDialog;
 import com.sparrowwallet.sparrow.transaction.TransactionController;
 import com.sparrowwallet.sparrow.transaction.TransactionView;

diff --git a/src/main/java/com/sparrowwallet/sparrow/control/TitledDescriptionPane.java b/src/main/java/com/sparrowwallet/sparrow/control/TitledDescriptionPane.java
@@ -140,13 +140,17 @@ protected Node getContentBox(String message) {
     }
 
     private void removeArrow() {
+        removeArrow(0);
+    }
+
+    private void removeArrow(int count) {
         Platform.runLater(() -> {
             Node arrow = this.lookup(".arrow");
             if (arrow != null) {
                 arrow.setVisible(false);
                 arrow.setManaged(false);
-            } else {
-                removeArrow();
+            } else if(count < 20) {
+                removeArrow(count+1);
             }
         });
     }

diff --git a/src/main/java/com/sparrowwallet/sparrow/event/WalletNodeHistoryChangedEvent.java b/src/main/java/com/sparrowwallet/sparrow/event/WalletNodeHistoryChangedEvent.java
@@ -3,7 +3,7 @@
 import com.sparrowwallet.drongo.KeyPurpose;
 import com.sparrowwallet.drongo.wallet.Wallet;
 import com.sparrowwallet.drongo.wallet.WalletNode;
-import com.sparrowwallet.sparrow.io.ElectrumServer;
+import com.sparrowwallet.sparrow.net.ElectrumServer;
 
 import java.util.List;
 

diff --git a/src/main/java/com/sparrowwallet/sparrow/net/BlockHeaderTip.java b/src/main/java/com/sparrowwallet/sparrow/net/BlockHeaderTip.java
@@ -0,0 +1,18 @@
+package com.sparrowwallet.sparrow.net;
+
+import com.sparrowwallet.drongo.Utils;
+import com.sparrowwallet.drongo.protocol.BlockHeader;
+
+class BlockHeaderTip {
+    public int height;
+    public String hex;
+
+    public BlockHeader getBlockHeader() {
+        if(hex == null) {
+            return null;
+        }
+
+        byte[] blockHeaderBytes = Utils.hexToBytes(hex);
+        return new BlockHeader(blockHeaderBytes);
+    }
+}