package: Increased version

- Added instructions for using HIP-02 to send HNS to Handshake addresses or domains.
- To use HIP-02, a user needs to have an HSD resolver listening on port 5350.
- A domain must be prefixed with `@` to use HIP-02 (e.g., `@nathan.woodburn`).

FireWallet/BatchForm.cs

@@ -638,17 +638,45 @@ namespace FireWallet
             openFileDialog.Title = "Open Batch";
             if (openFileDialog.ShowDialog() == DialogResult.OK)
             {
-                StreamReader sr = new StreamReader(openFileDialog.FileName);
+                try
-                string line;
-                string[] domains = new string[0];
-                while ((line = sr.ReadLine()) != null)
                 {
-                    string[] split = line.Split(',');
+                    StreamReader sr = new StreamReader(openFileDialog.FileName);
-                    try
+                    string line;
+                    string[] domains = new string[0];
+                    while ((line = sr.ReadLine()) != null)
                     {
-                        if (split.Length > 2)
+                        string[] split = line.Split(',');
+                        try
                         {
-                            if (split[1] == "UPDATE")
+                            if (split.Length > 2)
+                            {
+                                if (split[1] == "UPDATE")
+                                {
+                                    // Select operation and import domains
+                                    string[] newDomains = new string[domains.Length + 1];
+                                    for (int i = 0; i < domains.Length; i++)
+                                    {
+                                        newDomains[i] = domains[i];
+                                    }
+                                    newDomains[domains.Length] = split[0];
+                                    domains = newDomains;
+                                    continue;
+                                }
+                            }
+
+                            if (split.Length == 2)
+                            {
+                                AddBatch(split[0], split[1]);
+                            }
+                            else if (split.Length == 3)
+                            {
+                                AddBatch(split[0], split[1], split[2]);
+                            }
+                            else if (split.Length == 4)
+                            {
+                                AddBatch(split[0], split[1], Convert.ToDecimal(split[2]), Convert.ToDecimal(split[3]));
+                            }
+                            else
                             {
                                 // Select operation and import domains
                                 string[] newDomains = new string[domains.Length + 1];
@@ -656,68 +684,49 @@ namespace FireWallet
                                 {
                                     newDomains[i] = domains[i];
                                 }
-                                newDomains[domains.Length] = split[0];
+                                newDomains[domains.Length] = line.Trim();
                                 domains = newDomains;
-                                continue;
                             }
                         }
-
+                        catch (Exception ex)
-                        if (split.Length == 2)
                         {
-                            AddBatch(split[0], split[1]);
+                            AddLog("Error importing batch: " + ex.Message);
-                        }
+                            NotifyForm notifyForm = new NotifyForm("Error importing batch");
-                        else if (split.Length == 3)
+                            notifyForm.ShowDialog();
-                        {
+                            notifyForm.Dispose();
-                            AddBatch(split[0], split[1], split[2]);
-                        }
-                        else if (split.Length == 4)
-                        {
-                            AddBatch(split[0], split[1], Convert.ToDecimal(split[2]), Convert.ToDecimal(split[3]));
-                        }
-                        else
-                        {
-                            // Select operation and import domains
-                            string[] newDomains = new string[domains.Length + 1];
-                            for (int i = 0; i < domains.Length; i++)
-                            {
-                                newDomains[i] = domains[i];
-                            }
-                            newDomains[domains.Length] = line.Trim();
-                            domains = newDomains;
                         }
                     }
-                    catch (Exception ex)
+                    if (domains.Length > 0)
                     {
-                        AddLog("Error importing batch: " + ex.Message);
+                        BatchImportForm batchImportForm = new BatchImportForm(domains);
-                        NotifyForm notifyForm = new NotifyForm("Error importing batch");
+                        batchImportForm.ShowDialog();
-                        notifyForm.ShowDialog();
+                        if (batchImportForm.batches != null)
-                        notifyForm.Dispose();
+                        {
+                            foreach (Batch b in batchImportForm.batches)
+                            {
+                                if (b.method == "BID")
+                                {
+                                    AddBatch(b.domain, b.method, b.bid, b.lockup);
+                                }
+                                else if (b.method == "TRANSFER")
+                                {
+                                    AddBatch(b.domain, b.method, b.toAddress);
+                                }
+                                else
+                                {
+                                    AddBatch(b.domain, b.method);
+                                }
+                            }
+                        }
                     }
-                }
+                    sr.Dispose();
-                if (domains.Length > 0)
+                } catch (Exception ex)
                 {
-                    BatchImportForm batchImportForm = new BatchImportForm(domains);
+                    AddLog("Error importing batch: " + ex.Message);
-                    batchImportForm.ShowDialog();
+                    NotifyForm notifyForm = new NotifyForm("Error importing batch\nMake sure the file is in not in use");
-                    if (batchImportForm.batches != null)
+                    notifyForm.ShowDialog();
-                    {
+                    notifyForm.Dispose();
-                        foreach (Batch b in batchImportForm.batches)
-                        {
-                            if (b.method == "BID")
-                            {
-                                AddBatch(b.domain, b.method, b.bid, b.lockup);
-                            }
-                            else if (b.method == "TRANSFER")
-                            {
-                                AddBatch(b.domain, b.method, b.toAddress);
-                            }
-                            else
-                            {
-                                AddBatch(b.domain, b.method);
-                            }
-                        }
-                    }
                 }
-                sr.Dispose();
             }
         }
 

FireWallet/FireWallet.csproj

@@ -12,7 +12,7 @@
     <PackageIcon>HSDBatcher.png</PackageIcon>
     <RepositoryUrl>https://github.com/Nathanwoodburn/FireWallet</RepositoryUrl>
     <RepositoryType>git</RepositoryType>
-    <Version>3.0</Version>
+    <Version>3.1</Version>
   </PropertyGroup>
 
   <ItemGroup>

FireWallet/MainForm.Designer.cs

@@ -95,6 +95,7 @@ namespace FireWallet
             textBoxReceiveAddress = new TextBox();
             labelReceive1 = new Label();
             panelDomains = new Panel();
+            comboBoxDomainSort = new ComboBox();
             buttonExportDomains = new Button();
             groupBoxDomains = new GroupBox();
             panelDomainList = new Panel();
@@ -122,6 +123,7 @@ namespace FireWallet
             textBoxExAddr = new TextBox();
             labelSettings4 = new Label();
             textBoxExTX = new TextBox();
+            labelDomainSort = new Label();
             statusStripmain.SuspendLayout();
             panelaccount.SuspendLayout();
             groupBoxaccount.SuspendLayout();
@@ -783,6 +785,8 @@ namespace FireWallet
             // 
             // panelDomains
             // 
+            panelDomains.Controls.Add(labelDomainSort);
+            panelDomains.Controls.Add(comboBoxDomainSort);
             panelDomains.Controls.Add(buttonRenewAll);
             panelDomains.Controls.Add(buttonExportDomains);
             panelDomains.Controls.Add(groupBoxDomains);
@@ -794,6 +798,19 @@ namespace FireWallet
             panelDomains.TabIndex = 18;
             panelDomains.Visible = false;
             // 
+            // comboBoxDomainSort
+            // 
+            comboBoxDomainSort.DropDownStyle = ComboBoxStyle.DropDownList;
+            comboBoxDomainSort.FlatStyle = FlatStyle.Flat;
+            comboBoxDomainSort.Font = new Font("Segoe UI", 12F, FontStyle.Regular, GraphicsUnit.Point);
+            comboBoxDomainSort.FormattingEnabled = true;
+            comboBoxDomainSort.Items.AddRange(new object[] { "Default", "Alphabetical", "Expiring", "Value" });
+            comboBoxDomainSort.Location = new Point(686, 12);
+            comboBoxDomainSort.Name = "comboBoxDomainSort";
+            comboBoxDomainSort.Size = new Size(121, 29);
+            comboBoxDomainSort.TabIndex = 11;
+            comboBoxDomainSort.DropDownClosed += comboBoxDomainSort_DropDownClosed;
+            // 
             // buttonExportDomains
             // 
             buttonExportDomains.FlatStyle = FlatStyle.Flat;
@@ -1064,17 +1081,27 @@ namespace FireWallet
             textBoxExTX.Size = new Size(307, 29);
             textBoxExTX.TabIndex = 1;
             // 
+            // labelDomainSort
+            // 
+            labelDomainSort.AutoSize = true;
+            labelDomainSort.Font = new Font("Segoe UI", 12F, FontStyle.Regular, GraphicsUnit.Point);
+            labelDomainSort.Location = new Point(638, 15);
+            labelDomainSort.Name = "labelDomainSort";
+            labelDomainSort.Size = new Size(42, 21);
+            labelDomainSort.TabIndex = 12;
+            labelDomainSort.Text = "Sort:";
+            // 
             // MainForm
             // 
             AutoScaleDimensions = new SizeF(7F, 15F);
             AutoScaleMode = AutoScaleMode.Font;
             ClientSize = new Size(1152, 575);
+            Controls.Add(panelDomains);
             Controls.Add(panelSend);
             Controls.Add(panelSettings);
             Controls.Add(panelaccount);
             Controls.Add(panelPortfolio);
             Controls.Add(panelRecieve);
-            Controls.Add(panelDomains);
             Controls.Add(panelNav);
             Controls.Add(statusStripmain);
             Icon = (Icon)resources.GetObject("$this.Icon");
@@ -1205,5 +1232,7 @@ namespace FireWallet
         private ToolStripMenuItem supportDiscordServerToolStripMenuItem;
         private Label labelHIPArrow;
         private Label labelSendingHIPAddress;
+        private ComboBox comboBoxDomainSort;
+        private Label labelDomainSort;
     }
 }

FireWallet/MainForm.cs

@@ -221,6 +221,28 @@ namespace FireWallet
                                 return false;
                             }
                         }
+                    } else
+                    {
+                        if (!Directory.Exists(dir + "hsd"))
+                            {
+                                NotifyForm Notifyinstall = new NotifyForm("Installing hsd\nThis may take a few minutes\nDo not close FireWallet", false);
+                                Notifyinstall.Show();
+                                // Wait for the notification to show
+                                await Task.Delay(1000);
+
+                                string repositoryUrl = "https://github.com/handshake-org/hsd.git";
+                                string destinationPath = dir + "hsd";
+                                CloneRepository(repositoryUrl, destinationPath);
+
+                                Notifyinstall.CloseNotification();
+                                Notifyinstall.Dispose();
+                            }
+                            if (!Directory.Exists(dir + "hsd\\node_modules"))
+                            {
+                                AddLog("HSD install failed");
+                                this.Close();
+                                return false;
+                            }
                     }
 
 
@@ -1216,6 +1238,8 @@ namespace FireWallet
             groupBoxDomains.Width = panelDomains.Width - 20;
             groupBoxDomains.Left = 10;
             groupBoxDomains.Height = panelDomains.Height - groupBoxDomains.Top - 10;
+            comboBoxDomainSort.SelectedIndex = 0;
+
             UpdateDomains();
 
         }
@@ -1414,27 +1438,6 @@ namespace FireWallet
             return hex.ToString();
         }
 
-        private static string GetHash(HashAlgorithm hashAlgorithm, byte[] input)
-        {
-
-            // Convert the input string to a byte array and compute the hash.
-            byte[] data = hashAlgorithm.ComputeHash(input);
-
-            // Create a new Stringbuilder to collect the bytes
-            // and create a string.
-            var sBuilder = new StringBuilder();
-
-            // Loop through each byte of the hashed data
-            // and format each one as a hexadecimal string.
-            for (int i = 0; i < data.Length; i++)
-            {
-                sBuilder.Append(data[i].ToString("x2"));
-            }
-
-            // Return the hexadecimal string.
-            return sBuilder.ToString();
-        }
-
         private void textBoxSendingAmount_Leave(object sender, EventArgs e)
         {
             decimal amount = 0;
@@ -1881,6 +1884,33 @@ namespace FireWallet
             int i = 0;
             int renewable = 0;
             panelDomainList.Controls.Clear();
+
+            // Sort the domains
+            switch (comboBoxDomainSort.Text)
+            {
+                case "Default":
+                    break;
+                case "Alphabetical":
+                    names = new JArray(names.OrderBy(obj => (string)obj["name"]));
+                    break;
+                case "Expiring":
+                    names = new JArray(names.OrderBy(obj =>
+                    {
+                        JToken daysUntilExpireToken = obj["stats"]?["daysUntilExpire"];
+                        return (int)(daysUntilExpireToken ?? int.MaxValue);
+                    }));
+                    break;
+                case "Value":
+                    // Sort by most valuable first
+                    names = new JArray(names.OrderByDescending(obj =>
+                    {
+                        JToken valueToken = obj?["value"];
+                        return (int)(valueToken ?? 0);
+                    }));
+                    break;
+            }
+
+
             foreach (JObject name in names)
             {
                 Domains[i] = name["name"].ToString();
@@ -2002,6 +2032,43 @@ namespace FireWallet
             domainSearch = Regex.Replace(textBoxDomainSearch.Text, "[^a-zA-Z0-9-_]", "");
             textBoxDomainSearch.Text = domainSearch;
         }
+        private void export_Click(object sender, EventArgs e)
+        {
+            SaveFileDialog saveFileDialog = new SaveFileDialog();
+            saveFileDialog.Filter = "CSV file (*.csv)|*.csv";
+            saveFileDialog.Title = "Export";
+            if (saveFileDialog.ShowDialog() == DialogResult.OK)
+            {
+                StreamWriter sw = new StreamWriter(saveFileDialog.FileName);
+                foreach (string domain in DomainsRenewable)
+                {
+                    if (domain == null) break;
+                    sw.WriteLine(domain);
+                }
+                sw.Dispose();
+            }
+        }
+
+        private void buttonRenewAll_Click(object sender, EventArgs e)
+        {
+            if (DomainsRenewable == null)
+            {
+                NotifyForm notifyForm = new NotifyForm("No renewable domains found");
+                notifyForm.ShowDialog();
+                notifyForm.Dispose();
+                return;
+            }
+            foreach (string domain in DomainsRenewable)
+            {
+                if (domain == null) break;
+                AddBatch(domain, "RENEW");
+            }
+        }
+        private void comboBoxDomainSort_DropDownClosed(object sender, EventArgs e)
+        {
+            UpdateDomains();
+        }
+
 
         #endregion
         #region Batching
@@ -2149,39 +2216,7 @@ namespace FireWallet
         }
         #endregion
 
-        private void export_Click(object sender, EventArgs e)
+        #region Help Menu
-        {
-            SaveFileDialog saveFileDialog = new SaveFileDialog();
-            saveFileDialog.Filter = "CSV file (*.csv)|*.csv";
-            saveFileDialog.Title = "Export";
-            if (saveFileDialog.ShowDialog() == DialogResult.OK)
-            {
-                StreamWriter sw = new StreamWriter(saveFileDialog.FileName);
-                foreach (string domain in DomainsRenewable)
-                {
-                    if (domain == null) break;
-                    sw.WriteLine(domain);
-                }
-                sw.Dispose();
-            }
-        }
-
-        private void buttonRenewAll_Click(object sender, EventArgs e)
-        {
-            if (DomainsRenewable == null)
-            {
-                NotifyForm notifyForm = new NotifyForm("No renewable domains found");
-                notifyForm.ShowDialog();
-                notifyForm.Dispose();
-                return;
-            }
-            foreach (string domain in DomainsRenewable)
-            {
-                if (domain == null) break;
-                AddBatch(domain, "RENEW");
-            }
-        }
-
         private void githubToolStripMenuItem_Click(object sender, EventArgs e)
         {
             // Open the GitHub page
@@ -2212,5 +2247,6 @@ namespace FireWallet
             };
             Process.Start(psi);
         }
+        #endregion
     }
 }

FireWalletSetup/FireWalletSetup.vdproj

@@ -224,15 +224,15 @@
         {
         "Name" = "8:Microsoft Visual Studio"
         "ProductName" = "8:FireWallet"
-        "ProductCode" = "8:{007B0A5E-57B9-4DB7-AABE-5A3631A89BEB}"
+        "ProductCode" = "8:{460D8F86-4FE9-4547-9B17-7E01ACBF9194}"
-        "PackageCode" = "8:{546D4209-3E58-4144-A9DC-E659A2482DD4}"
+        "PackageCode" = "8:{A6678F97-9CE8-4005-82AC-AB2D09A9DA27}"
         "UpgradeCode" = "8:{0C86F725-6B01-4173-AA05-3F0EDF481362}"
         "AspNetVersion" = "8:"
         "RestartWWWService" = "11:FALSE"
         "RemovePreviousVersions" = "11:TRUE"
         "DetectNewerInstalledVersion" = "11:TRUE"
         "InstallAllUsers" = "11:FALSE"
-        "ProductVersion" = "8:3.0"
+        "ProductVersion" = "8:3.1"
         "Manufacturer" = "8:Nathan.Woodburn/"
         "ARPHELPTELEPHONE" = "8:"
         "ARPHELPLINK" = "8:https://l.woodburn.au/discord"

README.md

@@ -60,6 +60,9 @@ You can change the number of transactions shown in the `portfolio-tx:` settings.
 <br><br>
 ## Sending HNS
 ![Send](assets/send_hns.png)
+This page lets you send HNS to Handshake addresses or domains using [HIP-02](https://github.com/handshake-org/HIPs/blob/master/HIP-0002.md).  
+To use HIP-02 you need to have HSD resolver (or any HNS compatible DNS resolver) listening on port 5350 (default HSD port).  
+To enter a domain to use HIP-02 you need to prefix the domain with `@` (eg. `@nathan.woodburn`).
 
 ## Receiving HNS or Domains
 The receive page shows your current HNS address.  
@@ -104,6 +107,8 @@ The "CANCEL" transaction type is used to cancel an transfer.
 
 At the momemt "UPDATE" or coin only transactions are not supported.
 
+
+Please not that the import syntax for BIDs is BID,LOCKUP where LOCKUP is (BID+BLIND)
 ![Batch Import](assets/batch_import.png)
 
 ## Exporting