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

@@ -538,14 +538,8 @@ namespace FireWallet
                     notifyForm.Dispose();
                     return;
                 }
-                
-                StreamWriter sw = new StreamWriter(dir + "hsd-ledger/bin/names.txt");
-                string domainslist = string.Join(",", batches.Select(batch => batch.domain));
-                sw.Write(domainslist);
-                sw.Dispose();
-                StreamWriter sw2 = new StreamWriter(dir + "hsd-ledger/bin/batch.json");
-                sw2.Write(response);
-                sw2.Dispose();
+
+                string domainslist = string.Join(",", batches.Select(batch => "\\\"" + batch.domain + "\\\""));
 
                 NotifyForm notify = new NotifyForm("Please confirm the transaction on your Ledger device", false);
                 notify.Show();
@@ -558,7 +552,9 @@ namespace FireWallet
                 proc.StartInfo.RedirectStandardError = true;
                 proc.StartInfo.FileName = "node.exe";
                 proc.StartInfo.WorkingDirectory = dir + "hsd-ledger/bin/";
-                proc.StartInfo.Arguments = dir + "hsd-ledger/bin/hsd-ledger sendraw batch.json names.txt --api-key " + mainForm.nodeSettings["Key"] + " -w " + mainForm.account;
+                string args = "hsd-ledger/bin/hsd-ledger sendraw \"\"" + response.Replace("\"","\\\"") + "\"\" [" + domainslist + "] --api-key " + mainForm.nodeSettings["Key"] + " -w " + mainForm.account;
+
+                proc.StartInfo.Arguments = dir + args;
                 var outputBuilder = new StringBuilder();
 
                 // Event handler for capturing output data
@@ -590,6 +586,8 @@ namespace FireWallet
                 }
                 else
                 {
+                    AddLog(args);
+                    AddLog(proc.StandardError.ReadToEnd());
                     NotifyForm notifyError = new NotifyForm("Error Transaction Failed\nCheck logs for more details");
                     notifyError.ShowDialog();
                     notifyError.Dispose();
@@ -640,17 +638,45 @@ namespace FireWallet
             openFileDialog.Title = "Open Batch";
             if (openFileDialog.ShowDialog() == DialogResult.OK)
             {
-                StreamReader sr = new StreamReader(openFileDialog.FileName);
-                string line;
-                string[] domains = new string[0];
-                while ((line = sr.ReadLine()) != null)
+                try
                 {
-                    string[] split = line.Split(',');
-                    try
+                    StreamReader sr = new StreamReader(openFileDialog.FileName);
+                    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];
@@ -658,68 +684,49 @@ namespace FireWallet
                                 {
                                     newDomains[i] = domains[i];
                                 }
-                                newDomains[domains.Length] = split[0];
+                                newDomains[domains.Length] = line.Trim();
                                 domains = newDomains;
-                                continue;
                             }
                         }
-
-                        if (split.Length == 2)
+                        catch (Exception ex)
                         {
-                            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];
-                            for (int i = 0; i < domains.Length; i++)
-                            {
-                                newDomains[i] = domains[i];
-                            }
-                            newDomains[domains.Length] = line.Trim();
-                            domains = newDomains;
+                            AddLog("Error importing batch: " + ex.Message);
+                            NotifyForm notifyForm = new NotifyForm("Error importing batch");
+                            notifyForm.ShowDialog();
+                            notifyForm.Dispose();
                         }
                     }
-                    catch (Exception ex)
+                    if (domains.Length > 0)
                     {
-                        AddLog("Error importing batch: " + ex.Message);
-                        NotifyForm notifyForm = new NotifyForm("Error importing batch");
-                        notifyForm.ShowDialog();
-                        notifyForm.Dispose();
+                        BatchImportForm batchImportForm = new BatchImportForm(domains);
+                        batchImportForm.ShowDialog();
+                        if (batchImportForm.batches != null)
+                        {
+                            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);
+                                }
+                            }
+                        }
                     }
-                }
-                if (domains.Length > 0)
+                    sr.Dispose();
+                } catch (Exception ex)
                 {
-                    BatchImportForm batchImportForm = new BatchImportForm(domains);
-                    batchImportForm.ShowDialog();
-                    if (batchImportForm.batches != null)
-                    {
-                        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);
-                            }
-                        }
-                    }
+                    AddLog("Error importing batch: " + ex.Message);
+                    NotifyForm notifyForm = new NotifyForm("Error importing batch\nMake sure the file is in not in use");
+                    notifyForm.ShowDialog();
+                    notifyForm.Dispose();
                 }
-                sr.Dispose();
             }
         }
 

FireWallet/DomainForm.cs

@@ -32,36 +32,7 @@ namespace FireWallet
             this.explorerTX = explorerTX;
             this.explorerName = explorerName;
             this.mainForm = mainForm;
-        }
-
-        #region Theming
-        private void UpdateTheme()
-        {
-            // Check if file exists
-            if (!Directory.Exists(dir))
-            {
-                CreateConfig(dir);
-            }
-            if (!File.Exists(dir + "theme.txt"))
-            {
-                CreateConfig(dir);
-            }
-
-            // Read file
-            StreamReader sr = new StreamReader(dir + "theme.txt");
-            theme = new Dictionary<string, string>();
-            while (!sr.EndOfStream)
-            {
-                string line = sr.ReadLine();
-                string[] split = line.Split(':');
-                theme.Add(split[0].Trim(), split[1].Trim());
-            }
-            sr.Dispose();
-
-            if (!theme.ContainsKey("background") || !theme.ContainsKey("background-alt") || !theme.ContainsKey("foreground") || !theme.ContainsKey("foreground-alt"))
-            {
-                return;
-            }
+            this.theme = mainForm.theme;
 
             // Apply theme
             this.BackColor = ColorTranslator.FromHtml(theme["background"]);
@@ -73,35 +44,12 @@ namespace FireWallet
             // Need to specify this for each groupbox to override the black text
             foreach (Control c in Controls)
             {
-                ThemeControl(c);
+                mainForm.ThemeControl(c);
             }
 
-
-
-
-            // Transparancy
-            applyTransparency(theme);
-
-
+            applyTransparency(mainForm.theme);
         }
-        private void ThemeControl(Control c)
-        {
-            if (c.GetType() == typeof(GroupBox) || c.GetType() == typeof(Panel))
-            {
-                c.ForeColor = ColorTranslator.FromHtml(theme["foreground"]);
-                foreach (Control sub in c.Controls)
-                {
-                    ThemeControl(sub);
-                }
-            }
-            if (c.GetType() == typeof(TextBox) || c.GetType() == typeof(Button)
-                || c.GetType() == typeof(ComboBox) || c.GetType() == typeof(StatusStrip))
-            {
-                c.ForeColor = ColorTranslator.FromHtml(theme["foreground-alt"]);
-                c.BackColor = ColorTranslator.FromHtml(theme["background-alt"]);
-            }
-        }
-
+        #region Theme
         private void applyTransparency(Dictionary<string, string> theme)
         {
             if (theme.ContainsKey("transparent-mode"))
@@ -148,26 +96,6 @@ namespace FireWallet
                 }
             }
         }
-
-        private void CreateConfig(string dir)
-        {
-            if (!Directory.Exists(dir))
-            {
-                Directory.CreateDirectory(dir);
-            }
-            StreamWriter sw = new StreamWriter(dir + "theme.txt");
-            sw.WriteLine("background: #000000");
-            sw.WriteLine("foreground: #8e05c2");
-            sw.WriteLine("background-alt: #3e065f");
-            sw.WriteLine("foreground-alt: #ffffff");
-            sw.WriteLine("transparent-mode: off");
-            sw.WriteLine("transparency-key: main");
-            sw.WriteLine("transparency-percent: 90");
-
-            sw.Dispose();
-
-        }
-
         // Required for mica effect
         internal enum AccentState
         {
@@ -209,7 +137,6 @@ namespace FireWallet
 
         private void DomainForm_Load(object sender, EventArgs e)
         {
-            UpdateTheme();
             own = false;
             StreamReader sr = new StreamReader(dir + "node.txt");
             nodeSettings = new Dictionary<string, string>();
@@ -330,6 +257,14 @@ namespace FireWallet
                 {
                     labelStatusMain.Text = "Error";
                 }
+
+
+                if (labelStatusReserved.Text == "True")
+                {
+                    buttonActionAlt.Hide();
+                    buttonActionMain.Hide();
+                    groupBoxAction.Text = "Reserved";
+                }
             }
             catch (Exception ex)
             {
@@ -804,9 +739,6 @@ namespace FireWallet
             }
             else if (state == "AVAILABLE")
             {
-                decimal bid = Convert.ToDecimal(textBoxBid.Text);
-                decimal blind = Convert.ToDecimal(textBoxBlind.Text);
-                decimal lockup = bid + blind;
                 string content = "{\"method\": \"sendopen\", \"params\": [\"" + domain + "\"]}";
 
                 string response = await APIPost("", true, content);

FireWallet/FireWallet.csproj

@@ -12,7 +12,7 @@
     <PackageIcon>HSDBatcher.png</PackageIcon>
     <RepositoryUrl>https://github.com/Nathanwoodburn/FireWallet</RepositoryUrl>
     <RepositoryType>git</RepositoryType>
-    <Version>2.4</Version>
+    <Version>3.1</Version>
   </PropertyGroup>
 
   <ItemGroup>
@@ -27,6 +27,7 @@
   </ItemGroup>
 
   <ItemGroup>
+    <PackageReference Include="DnsClient" Version="1.7.0" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
     <PackageReference Include="QRCoder" Version="1.4.3" />
   </ItemGroup>

FireWallet/MainForm.Designer.cs

@@ -41,6 +41,10 @@ namespace FireWallet
             toolStripStatusLabelaccount = new ToolStripStatusLabel();
             toolStripStatusLabelLedger = new ToolStripStatusLabel();
             toolStripSplitButtonlogout = new ToolStripSplitButton();
+            toolStripDropDownButtonHelp = new ToolStripDropDownButton();
+            githubToolStripMenuItem = new ToolStripMenuItem();
+            websiteToolStripMenuItem = new ToolStripMenuItem();
+            supportDiscordServerToolStripMenuItem = new ToolStripMenuItem();
             timerNodeStatus = new System.Windows.Forms.Timer(components);
             panelaccount = new Panel();
             groupBoxaccount = new GroupBox();
@@ -59,7 +63,6 @@ namespace FireWallet
             buttonNavSend = new Button();
             buttonNavPortfolio = new Button();
             panelPortfolio = new Panel();
-            buttonRenewAll = new Button();
             buttonRevealAll = new Button();
             groupBoxTransactions = new GroupBox();
             groupBoxinfo = new GroupBox();
@@ -70,7 +73,9 @@ namespace FireWallet
             labelBalanceTotal = new Label();
             labelLocked = new Label();
             labelBalance = new Label();
+            buttonRenewAll = new Button();
             panelSend = new Panel();
+            labelSendingHIPAddress = new Label();
             checkBoxSendSubFee = new CheckBox();
             buttonSendMax = new Button();
             buttonSendHNS = new Button();
@@ -82,6 +87,7 @@ namespace FireWallet
             labelSendingAmount = new Label();
             labelSendingTo = new Label();
             labelSendPrompt = new Label();
+            labelHIPArrow = new Label();
             panelRecieve = new Panel();
             buttonAddressVerify = new Button();
             pictureBoxReceiveQR = new PictureBox();
@@ -89,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();
@@ -116,6 +123,7 @@ namespace FireWallet
             textBoxExAddr = new TextBox();
             labelSettings4 = new Label();
             textBoxExTX = new TextBox();
+            labelDomainSort = new Label();
             statusStripmain.SuspendLayout();
             panelaccount.SuspendLayout();
             groupBoxaccount.SuspendLayout();
@@ -139,7 +147,7 @@ namespace FireWallet
             // statusStripmain
             // 
             statusStripmain.Dock = DockStyle.Top;
-            statusStripmain.Items.AddRange(new ToolStripItem[] { toolStripStatusLabelNetwork, toolStripStatusLabelstatus, toolStripStatusLabelaccount, toolStripStatusLabelLedger, toolStripSplitButtonlogout });
+            statusStripmain.Items.AddRange(new ToolStripItem[] { toolStripStatusLabelNetwork, toolStripStatusLabelstatus, toolStripStatusLabelaccount, toolStripStatusLabelLedger, toolStripSplitButtonlogout, toolStripDropDownButtonHelp });
             statusStripmain.Location = new Point(0, 0);
             statusStripmain.Name = "statusStripmain";
             statusStripmain.Size = new Size(1152, 22);
@@ -190,6 +198,39 @@ namespace FireWallet
             toolStripSplitButtonlogout.Visible = false;
             toolStripSplitButtonlogout.ButtonClick += Logout;
             // 
+            // toolStripDropDownButtonHelp
+            // 
+            toolStripDropDownButtonHelp.DisplayStyle = ToolStripItemDisplayStyle.Text;
+            toolStripDropDownButtonHelp.DropDownItems.AddRange(new ToolStripItem[] { githubToolStripMenuItem, websiteToolStripMenuItem, supportDiscordServerToolStripMenuItem });
+            toolStripDropDownButtonHelp.Image = (Image)resources.GetObject("toolStripDropDownButtonHelp.Image");
+            toolStripDropDownButtonHelp.ImageTransparentColor = Color.Magenta;
+            toolStripDropDownButtonHelp.Margin = new Padding(20, 2, 0, 0);
+            toolStripDropDownButtonHelp.Name = "toolStripDropDownButtonHelp";
+            toolStripDropDownButtonHelp.Size = new Size(45, 20);
+            toolStripDropDownButtonHelp.Text = "Help";
+            toolStripDropDownButtonHelp.ToolTipText = "Help";
+            // 
+            // githubToolStripMenuItem
+            // 
+            githubToolStripMenuItem.Name = "githubToolStripMenuItem";
+            githubToolStripMenuItem.Size = new Size(194, 22);
+            githubToolStripMenuItem.Text = "Github";
+            githubToolStripMenuItem.Click += githubToolStripMenuItem_Click;
+            // 
+            // websiteToolStripMenuItem
+            // 
+            websiteToolStripMenuItem.Name = "websiteToolStripMenuItem";
+            websiteToolStripMenuItem.Size = new Size(194, 22);
+            websiteToolStripMenuItem.Text = "Website";
+            websiteToolStripMenuItem.Click += websiteToolStripMenuItem_Click;
+            // 
+            // supportDiscordServerToolStripMenuItem
+            // 
+            supportDiscordServerToolStripMenuItem.Name = "supportDiscordServerToolStripMenuItem";
+            supportDiscordServerToolStripMenuItem.Size = new Size(194, 22);
+            supportDiscordServerToolStripMenuItem.Text = "Support Discord Server";
+            supportDiscordServerToolStripMenuItem.Click += supportDiscordServerToolStripMenuItem_Click;
+            // 
             // timerNodeStatus
             // 
             timerNodeStatus.Enabled = true;
@@ -400,18 +441,6 @@ namespace FireWallet
             panelPortfolio.TabIndex = 7;
             panelPortfolio.Visible = false;
             // 
-            // buttonRenewAll
-            // 
-            buttonRenewAll.FlatStyle = FlatStyle.Flat;
-            buttonRenewAll.Font = new Font("Segoe UI", 12F, FontStyle.Regular, GraphicsUnit.Point);
-            buttonRenewAll.Location = new Point(813, 9);
-            buttonRenewAll.Name = "buttonRenewAll";
-            buttonRenewAll.Size = new Size(89, 32);
-            buttonRenewAll.TabIndex = 10;
-            buttonRenewAll.Text = "Renew All";
-            buttonRenewAll.UseVisualStyleBackColor = true;
-            buttonRenewAll.Click += buttonRenewAll_Click;
-            // 
             // buttonRevealAll
             // 
             buttonRevealAll.FlatStyle = FlatStyle.Flat;
@@ -518,8 +547,21 @@ namespace FireWallet
             labelBalance.TabIndex = 0;
             labelBalance.Text = "labelBalance";
             // 
+            // buttonRenewAll
+            // 
+            buttonRenewAll.FlatStyle = FlatStyle.Flat;
+            buttonRenewAll.Font = new Font("Segoe UI", 12F, FontStyle.Regular, GraphicsUnit.Point);
+            buttonRenewAll.Location = new Point(813, 9);
+            buttonRenewAll.Name = "buttonRenewAll";
+            buttonRenewAll.Size = new Size(89, 32);
+            buttonRenewAll.TabIndex = 10;
+            buttonRenewAll.Text = "Renew All";
+            buttonRenewAll.UseVisualStyleBackColor = true;
+            buttonRenewAll.Click += buttonRenewAll_Click;
+            // 
             // panelSend
             // 
+            panelSend.Controls.Add(labelSendingHIPAddress);
             panelSend.Controls.Add(checkBoxSendSubFee);
             panelSend.Controls.Add(buttonSendMax);
             panelSend.Controls.Add(buttonSendHNS);
@@ -531,12 +573,23 @@ namespace FireWallet
             panelSend.Controls.Add(labelSendingAmount);
             panelSend.Controls.Add(labelSendingTo);
             panelSend.Controls.Add(labelSendPrompt);
-            panelSend.Location = new Point(1113, 42);
+            panelSend.Controls.Add(labelHIPArrow);
+            panelSend.Location = new Point(138, 33);
             panelSend.Name = "panelSend";
             panelSend.Size = new Size(974, 521);
             panelSend.TabIndex = 2;
             panelSend.Visible = false;
             // 
+            // labelSendingHIPAddress
+            // 
+            labelSendingHIPAddress.AutoSize = true;
+            labelSendingHIPAddress.Location = new Point(375, 130);
+            labelSendingHIPAddress.Name = "labelSendingHIPAddress";
+            labelSendingHIPAddress.Size = new Size(64, 15);
+            labelSendingHIPAddress.TabIndex = 17;
+            labelSendingHIPAddress.Text = "To Address";
+            labelSendingHIPAddress.Visible = false;
+            // 
             // checkBoxSendSubFee
             // 
             checkBoxSendSubFee.AutoSize = true;
@@ -579,11 +632,11 @@ namespace FireWallet
             // 
             labelSendingError.AutoSize = true;
             labelSendingError.Font = new Font("Segoe UI", 12F, FontStyle.Regular, GraphicsUnit.Point);
-            labelSendingError.Location = new Point(615, 131);
+            labelSendingError.Location = new Point(679, 130);
             labelSendingError.Name = "labelSendingError";
-            labelSendingError.Size = new Size(52, 21);
+            labelSendingError.Size = new Size(78, 21);
             labelSendingError.TabIndex = 13;
-            labelSendingError.Text = "label1";
+            labelSendingError.Text = "labelError";
             labelSendingError.Visible = false;
             // 
             // labelSendingFee
@@ -654,6 +707,17 @@ namespace FireWallet
             labelSendPrompt.TabIndex = 0;
             labelSendPrompt.Text = "Send HNS";
             // 
+            // labelHIPArrow
+            // 
+            labelHIPArrow.AutoSize = true;
+            labelHIPArrow.Font = new Font("Segoe UI", 18F, FontStyle.Bold, GraphicsUnit.Point);
+            labelHIPArrow.Location = new Point(346, 119);
+            labelHIPArrow.Name = "labelHIPArrow";
+            labelHIPArrow.Size = new Size(32, 32);
+            labelHIPArrow.TabIndex = 18;
+            labelHIPArrow.Text = "⮡ ";
+            labelHIPArrow.Visible = false;
+            // 
             // panelRecieve
             // 
             panelRecieve.Controls.Add(buttonAddressVerify);
@@ -721,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);
@@ -732,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;
@@ -792,7 +871,7 @@ namespace FireWallet
             panelSettings.Controls.Add(buttonSettingsSave);
             panelSettings.Controls.Add(groupBoxSettingsExplorer);
             panelSettings.Font = new Font("Segoe UI", 12F, FontStyle.Regular, GraphicsUnit.Point);
-            panelSettings.Location = new Point(1065, 211);
+            panelSettings.Location = new Point(1065, 51);
             panelSettings.Name = "panelSettings";
             panelSettings.Size = new Size(930, 550);
             panelSettings.TabIndex = 19;
@@ -1002,19 +1081,29 @@ 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(panelSend);
             Controls.Add(panelNav);
             Controls.Add(statusStripmain);
-            Controls.Add(panelSettings);
             Icon = (Icon)resources.GetObject("$this.Icon");
             Name = "MainForm";
             Opacity = 0D;
@@ -1137,5 +1226,13 @@ namespace FireWallet
         private Button buttonRevealAll;
         private Button buttonExportDomains;
         private Button buttonRenewAll;
+        private ToolStripDropDownButton toolStripDropDownButtonHelp;
+        private ToolStripMenuItem githubToolStripMenuItem;
+        private ToolStripMenuItem websiteToolStripMenuItem;
+        private ToolStripMenuItem supportDiscordServerToolStripMenuItem;
+        private Label labelHIPArrow;
+        private Label labelSendingHIPAddress;
+        private ComboBox comboBoxDomainSort;
+        private Label labelDomainSort;
     }
 }

FireWallet/MainForm.cs

@@ -10,6 +10,10 @@ using System.Text;
 using System.Security.Policy;
 using System.Windows.Forms;
 using System.Net;
+using DnsClient;
+using DnsClient.Protocol;
+using System.Security.Cryptography.X509Certificates;
+using System.Net.Security;
 
 namespace FireWallet
 {
@@ -48,8 +52,19 @@ namespace FireWallet
             timerNodeStatus.Stop();
             LoadSettings();
             UpdateTheme();
+            // Theme drop down
+            foreach (ToolStripMenuItem c in toolStripDropDownButtonHelp.DropDownItems)
+            {
+                c.ForeColor = ColorTranslator.FromHtml(theme["foreground"]);
+                c.BackColor = ColorTranslator.FromHtml(theme["background"]);
+            }
+            toolStripDropDownButtonHelp.DropDown.BackColor = ColorTranslator.FromHtml(theme["background"]);
+
             if (await LoadNode() != true) this.Close();
 
+
+            if (this.Disposing || this.IsDisposed) return;
+
             if (userSettings.ContainsKey("hide-splash"))
             {
                 if (userSettings["hide-splash"] == "false")
@@ -89,6 +104,11 @@ namespace FireWallet
             AddLog("Loaded");
             Opacity = 1;
             batchMode = false;
+            // Pull form to front
+            this.WindowState = FormWindowState.Minimized;
+            this.Show();
+            this.WindowState = FormWindowState.Normal;
+
             textBoxaccountpassword.Focus();
         }
         private void MainForm_Closing(object sender, FormClosingEventArgs e)
@@ -175,20 +195,58 @@ namespace FireWallet
                     AddLog("Starting HSD");
                     toolStripStatusLabelstatus.Text = "Status: HSD Starting";
 
-                    if (!Directory.Exists(dir + "hsd"))
+                    string hsdPath = dir + "hsd\\bin\\hsd.exe";
+                    if (nodeSettings.ContainsKey("HSD-command"))
                     {
-                        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);
+                        if (nodeSettings["HSD-command"].Contains("{default-dir}"))
+                        {
+                            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);
+                                string repositoryUrl = "https://github.com/handshake-org/hsd.git";
+                                string destinationPath = dir + "hsd";
+                                CloneRepository(repositoryUrl, destinationPath);
 
-                        Notifyinstall.CloseNotification();
-                        Notifyinstall.Dispose();
+                                Notifyinstall.CloseNotification();
+                                Notifyinstall.Dispose();
+                            }
+                            if (!Directory.Exists(dir + "hsd\\node_modules"))
+                            {
+                                AddLog("HSD install failed");
+                                this.Close();
+                                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;
+                            }
                     }
+
+
+
                     hsdProcess = new Process();
 
                     bool hideScreen = true;
@@ -203,21 +261,75 @@ namespace FireWallet
                     {
                         hsdProcess.StartInfo.CreateNoWindow = hideScreen;
 
+                        if (hideScreen)
+                        {
+                            hsdProcess.StartInfo.RedirectStandardError = true;
+                        }
+                        else
+                        {
+                            hsdProcess.StartInfo.RedirectStandardError = false;
+                        }
+
                         hsdProcess.StartInfo.RedirectStandardInput = true;
                         hsdProcess.StartInfo.RedirectStandardOutput = false;
                         hsdProcess.StartInfo.UseShellExecute = false;
-                        hsdProcess.StartInfo.RedirectStandardError = false;
                         hsdProcess.StartInfo.FileName = "node.exe";
-                        hsdProcess.StartInfo.Arguments = dir + "hsd/bin/hsd --index-tx --index-address --api-key " + nodeSettings["Key"];
 
-                        string bobPath = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) + "\\Bob\\hsd_data";
-                        if (Directory.Exists(bobPath))
+                        if (nodeSettings.ContainsKey("HSD-command"))
                         {
-                            hsdProcess.StartInfo.Arguments = hsdProcess.StartInfo.Arguments + " --prefix " + bobPath;
+                            AddLog("Using custom HSD command");
+                            string command = nodeSettings["HSD-command"];
+                            command = command.Replace("{default-dir}", dir + "hsd\\bin\\hsd");
+
+                            string bobPath = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) + "\\Bob\\hsd_data";
+                            if (Directory.Exists(bobPath))
+                            {
+                                command = command.Replace("{Bob}", bobPath);
+                            }
+                            else if (command.Contains("{Bob}"))
+                            {
+                                AddLog("Bob not found, using default HSD command");
+                                command = dir + "hsd\\bin\\hsd --agent=FireWallet --index-tx --index-address --api-key " + nodeSettings["Key"];
+                            }
+
+                            command = command.Replace("{key}", nodeSettings["Key"]);
+                            hsdProcess.StartInfo.Arguments = command;
                         }
+                        else
+                        {
+                            AddLog("Using default HSD command");
+                            hsdProcess.StartInfo.Arguments = dir + "hsd\\bin\\hsd --agent=FireWallet --index-tx --index-address --api-key " + nodeSettings["Key"];
+                            string bobPath = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) + "\\Bob\\hsd_data";
+                            if (Directory.Exists(bobPath))
+                            {
+                                hsdProcess.StartInfo.Arguments = hsdProcess.StartInfo.Arguments + " --prefix " + bobPath;
+                            }
+                        }
+
+
+
+
                         hsdProcess.Start();
                         // Wait for HSD to start
                         await Task.Delay(2000);
+
+                        // Check if HSD is running
+                        if (hsdProcess.HasExited)
+                        {
+                            AddLog("HSD Failed to start");
+                            AddLog(hsdProcess.StandardError.ReadToEnd());
+                            NotifyForm Notifyinstall = new NotifyForm("HSD Failed to start\nPlease check the logs");
+                            Notifyinstall.ShowDialog();
+                            Notifyinstall.Dispose();
+
+                            // Wait for the notification to show
+                            await Task.Delay(1000);
+                            this.Close();
+
+                            await Task.Delay(1000);
+                            return false;
+                        }
+
                     }
                     catch (Exception ex)
                     {
@@ -225,9 +337,7 @@ namespace FireWallet
                         AddLog(ex.Message);
                         this.Close();
                         await Task.Delay(1000);
-                        AddLog("Close Failed");
                     }
-
                 }
             }
             timerNodeStatus.Start();
@@ -268,6 +378,19 @@ namespace FireWallet
         #region Logging
         public void AddLog(string message)
         {
+            if (message.Contains("Get Error: No connection could be made because the target machine actively refused it")) return;
+
+            // If file size is over 1MB, rename it to old.log.txt
+            if (File.Exists(dir + "log.txt"))
+            {
+                FileInfo fi = new FileInfo(dir + "log.txt");
+                if (fi.Length > 1000000)
+                {
+                    if (File.Exists(dir + "old.log.txt")) File.Delete(dir + "old.log.txt"); // Delete old log file as it is super old
+                    File.Move(dir + "log.txt", dir + "old.log.txt");
+                }
+            }
+
             StreamWriter sw = new StreamWriter(dir + "log.txt", true);
             sw.WriteLine(DateTime.Now.ToString() + ": " + message);
             sw.Dispose();
@@ -562,11 +685,15 @@ namespace FireWallet
                 watchOnly = true;
                 toolStripStatusLabelLedger.Text = "Cold Wallet";
                 toolStripStatusLabelLedger.Visible = true;
+                buttonRevealAll.Visible = false;
+
             }
             else
             {
                 watchOnly = false;
                 toolStripStatusLabelLedger.Visible = false;
+                buttonRevealAll.Visible = true;
+
             }
 
 
@@ -708,10 +835,9 @@ namespace FireWallet
         /// <returns></returns>
         public async Task<string> APIPost(string path, bool wallet, string content)
         {
-            if (content == "{\"passphrase\": \"\" ,\"timeout\": 60}")
+            if (content == "{\"passphrase\": \"\",\"timeout\": 60}")
             {
-                // For some reason, the API doesn't like an empty password, so we'll just use a default one
-                content = "{\"passphrase\": \"password\" ,\"timeout\": 60}";
+                return "";
             }
             string key = nodeSettings["Key"];
             string ip = nodeSettings["IP"];
@@ -737,6 +863,8 @@ namespace FireWallet
             catch (Exception ex)
             {
                 AddLog("Post Error: " + ex.Message);
+                AddLog(await resp.Content.ReadAsStringAsync());
+                AddLog("Content: " + content);
                 return "Error";
             }
 
@@ -805,6 +933,7 @@ namespace FireWallet
             decimal progress = Convert.ToDecimal(chain["progress"].ToString());
             labelSyncPercent.Text = "Sync: " + decimal.Round(progress * 100, 2) + "%";
 
+
             // Exit if set to 0 TXs
             if (userSettings.ContainsKey("portfolio-tx"))
             {
@@ -824,28 +953,65 @@ namespace FireWallet
             labelPendingCount.Text = "Unconfirmed TX: " + pendingTxs.Count.ToString();
 
 
-            // Get TX's
-            APIresponse = await APIGet("wallet/" + account + "/tx/history", true);
+            // Check how many TX there are
+            APIresponse = await APIGet("wallet/" + account, true);
+            JObject wallet = JObject.Parse(APIresponse);
+            if (!wallet.ContainsKey("balance"))
+            {
+                AddLog("GetInfo Error");
+                AddLog(APIresponse);
+                return;
+            }
+            JObject balance = JObject.Parse(wallet["balance"].ToString());
+            int TotalTX = Convert.ToInt32(balance["tx"].ToString());
+            int toGet = 10;
+            if (userSettings.ContainsKey("portfolio-tx")) toGet = Convert.ToInt32(userSettings["portfolio-tx"]);
+
+            if (toGet > TotalTX) toGet = TotalTX;
+            int toSkip = TotalTX - toGet;
+
+            // GET TXs
+            if (watchOnly)
+            {
+                APIresponse = await APIPost("", true, "{\"method\": \"listtransactions\",\"params\": [\"default\"," + toGet + "," + toSkip + ", true]}");
+            }
+            else
+            {
+                APIresponse = await APIPost("", true, "{\"method\": \"listtransactions\",\"params\": [\"default\"," + toGet + "," + toSkip + "]}");
+            }
+
             if (APIresponse == "Error")
             {
                 AddLog("GetInfo Error");
                 return;
             }
-            JArray txs = JArray.Parse(APIresponse);
-            int txCount = txs.Count;
-            if (txCount > groupBoxTransactions.Height / 55) txCount = (int)Math.Floor(groupBoxTransactions.Height / 55.0);
-            if (userSettings.ContainsKey("portfolio-tx")) txCount = Convert.ToInt32(userSettings["portfolio-tx"]);
-            if (txCount > txs.Count) txCount = txs.Count;
-            Control[] tmpControls = new Control[txCount];
-            for (int i = 0; i < txCount; i++)
+            JObject TXGET = JObject.Parse(APIresponse);
+
+            // Check for error
+            if (TXGET["error"].ToString() != "")
+            {
+                AddLog("GetInfo Error");
+                AddLog(APIresponse);
+                return;
+            }
+
+            JArray txs = JArray.Parse(TXGET["result"].ToString());
+            if (toGet > txs.Count) toGet = txs.Count; // In case there are less TXs than expected (usually happens when the get TX's fails)
+            Control[] tmpControls = new Control[toGet];
+            for (int i = 0; i < toGet; i++)
             {
 
                 // Get last tx
-                JObject tx = JObject.Parse(txs[txs.Count - 1 - i].ToString());
+                JObject tx = JObject.Parse(await APIGet("wallet/" + account + "/tx/" + txs[toGet - i - 1]["txid"].ToString(), true));
 
                 string hash = tx["hash"].ToString();
                 string date = tx["mdate"].ToString();
 
+                date = DateTime.Parse(date).ToShortDateString();
+
+
+
+
                 Panel tmpPanel = new Panel();
                 tmpPanel.Width = groupBoxTransactions.Width - SystemInformation.VerticalScrollBarWidth - 20;
                 tmpPanel.Height = 50;
@@ -880,27 +1046,52 @@ namespace FireWallet
                     AutoSize = true,
                     Location = new Point(10, 25)
                 };
-                
+
                 tmpPanel.Controls.Add(labelHash);
 
-                // Count inputs and outputs
                 JArray inputs = JArray.Parse(tx["inputs"].ToString());
                 JArray outputs = JArray.Parse(tx["outputs"].ToString());
                 int inputCount = inputs.Count;
                 int outputCount = outputs.Count;
 
+                decimal costHNS = decimal.Parse(txs[toGet - i - 1]["amount"].ToString());
+                string cost = "";
+                if (costHNS < 0)
+                {
+                    cost = "Spent: " + (costHNS * -1).ToString() + " HNS";
+                }
+                else if (costHNS > 0)
+                {
+                    cost = "Received: " + costHNS.ToString() + " HNS";
+                }
+
+
+
+
+
                 Label labelInputOutput = new Label()
                 {
-                    Text = "Inputs: " + inputCount + " Outputs: " + outputCount,
+                    Text = "Inputs: " + inputCount + " Outputs: " + outputCount + "\n" + cost,
                     AutoSize = true,
-                    Location = new Point(300, 20)
+                    Location = new Point(300, 5)
                 };
                 tmpPanel.Controls.Add(labelInputOutput);
+
+
                 tmpPanel.Click += (sender, e) =>
                 {
-                    TXForm txForm = new TXForm(this, tx);
+                    TXForm txForm = new TXForm(this, hash);
                     txForm.Show();
                 };
+                foreach (Control c in tmpPanel.Controls)
+                {
+                    c.Click += (sender, e) =>
+                    {
+                        TXForm txForm = new TXForm(this, hash);
+                        txForm.Show();
+                    };
+                }
+
                 tmpControls[i] = tmpPanel;
 
 
@@ -919,17 +1110,17 @@ namespace FireWallet
         {
             try
             {
-                string response = await APIGet("fee", false);
+                string response = await APIPost("", false, "{\"method\": \"estimatefee\",\"params\": [ 3 ]}");
                 JObject resp = JObject.Parse(response);
-                decimal fee = Convert.ToDecimal(resp["rate"].ToString());
-                fee = fee / 1000000;
-                if (fee < 0.0001m) fee = 1;
+                string result = resp["result"].ToString();
+                decimal fee = decimal.Parse(result);
+                if (fee < 0.001m) fee = 1;
 
                 return fee.ToString();
-                //return resp["rate"].ToString();
             }
             catch
             {
+                AddLog("GetFee Error");
                 return "1";
             }
         }
@@ -995,6 +1186,7 @@ namespace FireWallet
             labelSendingMax.Text = "Max: " + balance.ToString() + " HNS";
             textBoxSendingTo.Focus();
             string fee = await GetFee();
+
             labelSendingFee.Text = "Est. Fee: " + fee + " HNS";
             labelSendingError.Hide();
 
@@ -1046,6 +1238,8 @@ namespace FireWallet
             groupBoxDomains.Width = panelDomains.Width - 20;
             groupBoxDomains.Left = 10;
             groupBoxDomains.Height = panelDomains.Height - groupBoxDomains.Top - 10;
+            comboBoxDomainSort.SelectedIndex = 0;
+
             UpdateDomains();
 
         }
@@ -1077,6 +1271,7 @@ namespace FireWallet
             }
 
             panelSettings.Show();
+            panelSettings.Dock = DockStyle.Fill;
             buttonSettingsSave.Top = panelSettings.Height - buttonSettingsSave.Height - 10;
             labelSettingsSaved.Top = buttonSettingsSave.Top + 10;
             textBoxExTX.Text = userSettings["explorer-tx"];
@@ -1089,14 +1284,96 @@ namespace FireWallet
         }
         #endregion
         #region Send
+
+        // Store TLSA hash
+        public string TLSA { get; set; }
         private async void textBoxSendingTo_Leave(object sender, EventArgs e)
         {
+            labelSendingError.Hide();
+            labelHIPArrow.Hide();
+            labelSendingHIPAddress.Hide();
             if (textBoxSendingTo.Text == "") return;
             if (textBoxSendingTo.Text.Substring(0, 1) == "@")
             {
-                labelSendingError.Show();
-                labelSendingError.Text = "HIP-02 Not supported yet";
-                return;
+                string domain = textBoxSendingTo.Text.Substring(1);
+
+                try
+                {
+                    IPAddress iPAddress = null;
+                    TLSA = "";
+
+
+                    // Create an instance of LookupClient using the custom options
+                    NameServer nameServer = new NameServer(IPAddress.Parse("127.0.0.1"), 5350);
+                    var options = new LookupClientOptions(nameServer);
+                    options.EnableAuditTrail = true;
+                    options.UseTcpOnly = true;
+                    options.Recursion = true;
+                    options.UseCache = false;
+                    options.RequestDnsSecRecords = true;
+                    options.Timeout = TimeSpan.FromSeconds(5);
+
+
+                    var client = new LookupClient(options);
+
+
+                    // Perform the DNS lookup for the specified domain using DNSSec
+
+                    var result = client.Query(domain, QueryType.A);
+
+
+
+
+
+                    // Display the DNS lookup results
+                    foreach (var record in result.Answers.OfType<ARecord>())
+                    {
+                        iPAddress = record.Address;
+                    }
+
+                    if (iPAddress == null)
+                    {
+                        labelSendingError.Show();
+                        labelSendingError.Text = "HIP-02 lookup failed";
+                        return;
+                    }
+
+                    // Get TLSA record
+                    var resultTLSA = client.Query("_443._tcp." + domain, QueryType.TLSA);
+                    foreach (var record in resultTLSA.Answers.OfType<TlsaRecord>())
+                    {
+                        TLSA = record.CertificateAssociationDataAsString;
+                    }
+
+
+
+                    string url = "https://" + iPAddress.ToString() + "/.well-known/wallets/HNS";
+                    var handler = new HttpClientHandler();
+
+                    handler.ServerCertificateCustomValidationCallback = ValidateServerCertificate;
+
+                    // Create an instance of HttpClient with the custom handler
+                    using (var httpclient = new HttpClient(handler))
+                    {
+                        httpclient.DefaultRequestHeaders.Add("Host", domain);
+                        // Send a GET request to the specified URL
+                        HttpResponseMessage response = httpclient.GetAsync(url).Result;
+
+                        // Response
+                        string address = response.Content.ReadAsStringAsync().Result;
+
+                        labelSendingHIPAddress.Text = address;
+                        labelSendingHIPAddress.Show();
+                        labelHIPArrow.Show();
+                    }
+
+                }
+                catch (Exception ex)
+                {
+                    AddLog(ex.Message);
+                    labelSendingError.Show();
+                    labelSendingError.Text = "HIP-02 lookup failed";
+                }
             }
             else
             {
@@ -1121,6 +1398,46 @@ namespace FireWallet
                 }
             }
         }
+        public bool ValidateServerCertificate(object sender, X509Certificate certificate, X509Chain chain, SslPolicyErrors sslPolicyErrors)
+        {
+            // Customize the certificate validation logic here if needed
+
+            // Return true to accept the certificate or false to reject it
+            X509Certificate2 cert2 = new X509Certificate2(certificate);
+
+
+            var rsaPublicKey = (RSA)cert2.PublicKey.Key;
+
+            // Calculate the SHA-256 hash of the public key
+            using (var sha256 = SHA256.Create())
+            {
+                byte[] publicKeyBytes = rsaPublicKey.ExportSubjectPublicKeyInfo();
+                byte[] publicKeyHash = sha256.ComputeHash(publicKeyBytes);
+
+                // Convert the hash value to hexadecimal format
+                string hexFingerprint = ByteArrayToHexString(publicKeyHash);
+
+                if (hexFingerprint == TLSA)
+                {
+                    return true;
+                }
+                else
+                {
+                    AddLog("TLSA mismatch");
+                    return false;
+                }
+            }
+        }
+        static string ByteArrayToHexString(byte[] bytes)
+        {
+            StringBuilder hex = new StringBuilder(bytes.Length * 2);
+            foreach (byte b in bytes)
+            {
+                hex.AppendFormat("{0:X2}", b);
+            }
+            return hex.ToString();
+        }
+
         private void textBoxSendingAmount_Leave(object sender, EventArgs e)
         {
             decimal amount = 0;
@@ -1148,6 +1465,10 @@ namespace FireWallet
             try
             {
                 string address = textBoxSendingTo.Text;
+                if (labelHIPArrow.Visible)
+                {
+                    address = labelSendingHIPAddress.Text;
+                }
                 bool valid = await ValidAddress(address);
                 if (!valid)
                 {
@@ -1315,9 +1636,87 @@ namespace FireWallet
                     }
                 }
 
+                // Check if git is installed
+                Process testInstalled = new Process();
+                testInstalled.StartInfo.FileName = "git";
+                testInstalled.StartInfo.Arguments = "-v";
+                testInstalled.StartInfo.RedirectStandardOutput = true;
+                testInstalled.StartInfo.UseShellExecute = false;
+                testInstalled.StartInfo.CreateNoWindow = true;
+                testInstalled.Start();
+                string outputInstalled = testInstalled.StandardOutput.ReadToEnd();
+                testInstalled.WaitForExit();
+
+                if (!outputInstalled.Contains("git version"))
+                {
+                    AddLog("Git is not installed");
+                    NotifyForm notifyForm = new NotifyForm("Git is not installed\nPlease install it to install HSD dependencies");
+                    notifyForm.ShowDialog();
+                    notifyForm.Dispose();
+                    this.Close();
+                    Thread.Sleep(1000);
+                    return;
+                }
+
+                // Check if node installed
+                testInstalled = new Process();
+                testInstalled.StartInfo.FileName = "node";
+                testInstalled.StartInfo.Arguments = "-v";
+                testInstalled.StartInfo.RedirectStandardOutput = true;
+                testInstalled.StartInfo.UseShellExecute = false;
+                testInstalled.StartInfo.CreateNoWindow = true;
+                testInstalled.Start();
+                outputInstalled = testInstalled.StandardOutput.ReadToEnd();
+                testInstalled.WaitForExit();
+
+                if (!outputInstalled.Contains("v"))
+                {
+                    AddLog("Node is not installed");
+                    NotifyForm notifyForm = new NotifyForm("Node is not installed\nPlease install it to install HSD dependencies");
+                    notifyForm.ShowDialog();
+                    notifyForm.Dispose();
+                    this.Close();
+                    Thread.Sleep(1000);
+                    return;
+                }
+
+
+                // Check if npm installed
+                testInstalled = new Process();
+                testInstalled.StartInfo.FileName = "cmd.exe";
+                testInstalled.StartInfo.Arguments = "npm -v";
+                testInstalled.StartInfo.RedirectStandardOutput = true;
+                testInstalled.StartInfo.UseShellExecute = false;
+                testInstalled.StartInfo.CreateNoWindow = false;
+                testInstalled.Start();
+                // Wait 3 seconds and then kill
+                Thread.Sleep(3000);
+                testInstalled.Kill();
+                outputInstalled = testInstalled.StandardOutput.ReadToEnd();
+                testInstalled.WaitForExit();
+                if (Regex.IsMatch(outputInstalled, @"^\d+\.\d+\.\d+$"))
+                {
+                    AddLog("NPM is not installed");
+                    AddLog(outputInstalled);
+                    NotifyForm notifyForm = new NotifyForm("NPM is not installed\nPlease install it to install HSD dependencies");
+                    notifyForm.ShowDialog();
+                    notifyForm.Dispose();
+                    this.Close();
+                    Thread.Sleep(1000);
+                    return;
+                }
+
+                AddLog("Prerequisites installed");
+
                 ProcessStartInfo startInfo = new ProcessStartInfo();
                 startInfo.FileName = "git";
                 startInfo.Arguments = $"clone {repositoryUrl} {destinationPath}";
+
+                if (repositoryUrl == "https://github.com/handshake-org/hsd.git")
+                {
+                    startInfo.Arguments = $"clone --depth 1 --branch latest {repositoryUrl} {destinationPath}";
+                }
+
                 startInfo.RedirectStandardOutput = true;
                 startInfo.UseShellExecute = false;
                 startInfo.CreateNoWindow = hideScreen;
@@ -1362,6 +1761,32 @@ namespace FireWallet
             {
                 AddLog("Git/NPM Install FAILED");
                 AddLog(ex.Message);
+                if (ex.Message.Contains("to start process 'git'"))
+                {
+                    NotifyForm notifyForm = new NotifyForm("Git needs to be installed\nCheck logs for more details");
+                    notifyForm.ShowDialog();
+                    notifyForm.Dispose();
+                }
+                else if (ex.Message.Contains("to start process 'node'"))
+                {
+                    NotifyForm notifyForm = new NotifyForm("Node needs to be installed\nCheck logs for more details");
+                    notifyForm.ShowDialog();
+                    notifyForm.Dispose();
+                }
+                else if (ex.Message.Contains("to start process 'npm'"))
+                {
+                    NotifyForm notifyForm = new NotifyForm("NPM needs to be installed\nCheck logs for more details");
+                    notifyForm.ShowDialog();
+                    notifyForm.Dispose();
+                }
+                else
+                {
+
+                    NotifyForm notifyForm = new NotifyForm("Git/NPM Install FAILED\nCheck logs for more details");
+                    notifyForm.ShowDialog();
+                    notifyForm.Dispose();
+                }
+                this.Close();
             }
         }
         public bool CheckNodeInstalled()
@@ -1459,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();
@@ -1469,13 +1921,6 @@ namespace FireWallet
                 domainTMP.Left = 10;
                 domainTMP.BorderStyle = BorderStyle.FixedSingle;
 
-                // On Click open domain
-                domainTMP.Click += new EventHandler((sender, e) =>
-                {
-                    DomainForm domainForm = new DomainForm(this, name["name"].ToString(), userSettings["explorer-tx"], userSettings["explorer-domain"]);
-                    domainForm.Show();
-                });
-
                 Label domainName = new Label();
                 domainName.Text = Domains[i];
                 domainName.Top = 5;
@@ -1485,7 +1930,8 @@ namespace FireWallet
 
                 domainTMP.Controls.Add(domainName);
 
-                if (!name.ContainsKey("stats")) {
+                if (!name.ContainsKey("stats"))
+                {
                     AddLog("Domain " + Domains[i] + " does not have stats");
                     continue;
                 }
@@ -1514,8 +1960,23 @@ namespace FireWallet
                 }
 
 
+                // On Click open domain
+                domainTMP.Click += new EventHandler((sender, e) =>
+                {
+                    DomainForm domainForm = new DomainForm(this, name["name"].ToString(), userSettings["explorer-tx"], userSettings["explorer-domain"]);
+                    domainForm.Show();
+                });
 
 
+                foreach (Control c in domainTMP.Controls)
+                {
+                    c.Click += new EventHandler((sender, e) =>
+                    {
+                        DomainForm domainForm = new DomainForm(this, name["name"].ToString(), userSettings["explorer-tx"], userSettings["explorer-domain"]);
+                        domainForm.Show();
+                    });
+                }
+
                 panelDomainList.Controls.Add(domainTMP);
                 i++;
             }
@@ -1534,7 +1995,7 @@ namespace FireWallet
                 return;
             }
             JObject resp = JObject.Parse(response);
-            if (resp["error"] != null)
+            if (resp["error"].ToString() != "")
             {
                 AddLog("Error sending reveal");
                 AddLog(resp["error"].ToString());
@@ -1571,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
@@ -1718,37 +2216,37 @@ namespace FireWallet
         }
         #endregion
 
-        private void export_Click(object sender, EventArgs e)
+        #region Help Menu
+        private void githubToolStripMenuItem_Click(object sender, EventArgs e)
         {
-            SaveFileDialog saveFileDialog = new SaveFileDialog();
-            saveFileDialog.Filter = "CSV file (*.csv)|*.csv";
-            saveFileDialog.Title = "Export";
-            if (saveFileDialog.ShowDialog() == DialogResult.OK)
+            // Open the GitHub page
+            ProcessStartInfo psi = new ProcessStartInfo
             {
-                StreamWriter sw = new StreamWriter(saveFileDialog.FileName);
-                foreach (string domain in DomainsRenewable)
-                {
-                    if (domain == null) break;
-                    sw.WriteLine(domain);
-                }
-                sw.Dispose();
-            }
+                FileName = "https://github.com/Nathanwoodburn/FireWallet/",
+                UseShellExecute = true
+            };
+            Process.Start(psi);
         }
 
-        private void buttonRenewAll_Click(object sender, EventArgs e)
+        private void websiteToolStripMenuItem_Click(object sender, EventArgs e)
         {
-            if (DomainsRenewable == null)
+            ProcessStartInfo psi = new ProcessStartInfo
             {
-                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");
-            }
+                FileName = "https://firewallet",
+                UseShellExecute = true
+            };
+            Process.Start(psi);
         }
+
+        private void supportDiscordServerToolStripMenuItem_Click(object sender, EventArgs e)
+        {
+            ProcessStartInfo psi = new ProcessStartInfo
+            {
+                FileName = "https://l.woodburn.au/discord",
+                UseShellExecute = true
+            };
+            Process.Start(psi);
+        }
+        #endregion
     }
 }

FireWallet/MainForm.resx

@@ -120,10 +120,19 @@
   <metadata name="statusStripmain.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>133, 17</value>
   </metadata>
+  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <data name="toolStripDropDownButtonHelp.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAACRSURBVDhPY/j27dt/SjDYACcnJ7IwigEf3n8kCZNswPNb
+        J/+f6DYF0yA+yQac6Db5f6hWCmwIiE+mC0wIu2DS2Vf/F1x6DefjwlgNyNr34r/0wkdgTMgQDAOQNRNj
+        CIoBOg0rMTTDMLIhIHbriZeYBmDTiIxBGkEYxge5liQDsGGQqykyAISpZwAlmIEywMAAAAc1/Jwvt6sN
+        AAAAAElFTkSuQmCC
+</value>
+  </data>
   <metadata name="timerNodeStatus.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>269, 17</value>
   </metadata>
-  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
   <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         AAABAAEAAAAAAAEAIAB2pAAAFgAAAIlQTkcNChoKAAAADUlIRFIAAAOEAAADAAgGAAAAfG+p9QAAIABJ

FireWallet/TXForm.cs

@@ -17,7 +17,8 @@ namespace FireWallet
     {
         MainForm mainForm;
         JObject tx;
-        public TXForm(MainForm mainForm, JObject tx)
+        string txid;
+        public TXForm(MainForm mainForm, string txid)
         {
             InitializeComponent();
             // Theme
@@ -29,16 +30,20 @@ namespace FireWallet
             }
 
             this.mainForm = mainForm;
-            this.tx = tx;
-
-            this.Text = "TX: " + tx["hash"].ToString();
+            this.txid = txid;
         }
 
         private async void TXForm_Load(object sender, EventArgs e)
         {
+            tx = JObject.Parse(await mainForm.APIGet("wallet/"+mainForm.account+"/tx/" + txid,true));
+
+            this.Text = "TX: " + tx["hash"].ToString();
             labelHash.Text = "Hash: " + tx["hash"].ToString();
             mainForm.AddLog("Viewing TX: " + tx["hash"].ToString());
             
+            // Disable scrolling on the panels until they are populated
+            panelInputs.Visible = false;
+            panelOutputs.Visible = false;
 
             // For each input
             JArray inputs = (JArray)tx["inputs"];
@@ -74,7 +79,7 @@ namespace FireWallet
 
                 panelInputs.Controls.Add(PanelInput);
             }
-
+            panelInputs.Visible = true;
             // For each output
             JArray outputs = (JArray)tx["outputs"];
             foreach (JObject output in outputs)
@@ -131,6 +136,7 @@ namespace FireWallet
 
                 panelOutputs.Controls.Add(PanelOutput);
             }
+            panelOutputs.Visible = true;
         }
 
         private void Explorer_Click(object sender, EventArgs e)

FireWallet/TransferForm.Designer.cs

@@ -36,6 +36,8 @@
             label2 = new Label();
             textBoxAddress = new TextBox();
             labelError = new Label();
+            labelSendingHIPAddress = new Label();
+            labelHIPArrow = new Label();
             SuspendLayout();
             // 
             // buttonTransfer
@@ -105,18 +107,41 @@
             // labelError
             // 
             labelError.AutoSize = true;
-            labelError.Location = new Point(46, 139);
+            labelError.Location = new Point(492, 139);
             labelError.Name = "labelError";
             labelError.Size = new Size(98, 15);
             labelError.TabIndex = 6;
             labelError.Text = "Address not valid";
             labelError.Visible = false;
             // 
+            // labelSendingHIPAddress
+            // 
+            labelSendingHIPAddress.AutoSize = true;
+            labelSendingHIPAddress.Location = new Point(75, 150);
+            labelSendingHIPAddress.Name = "labelSendingHIPAddress";
+            labelSendingHIPAddress.Size = new Size(64, 15);
+            labelSendingHIPAddress.TabIndex = 19;
+            labelSendingHIPAddress.Text = "To Address";
+            labelSendingHIPAddress.Visible = false;
+            // 
+            // labelHIPArrow
+            // 
+            labelHIPArrow.AutoSize = true;
+            labelHIPArrow.Font = new Font("Segoe UI", 18F, FontStyle.Bold, GraphicsUnit.Point);
+            labelHIPArrow.Location = new Point(46, 139);
+            labelHIPArrow.Name = "labelHIPArrow";
+            labelHIPArrow.Size = new Size(32, 32);
+            labelHIPArrow.TabIndex = 20;
+            labelHIPArrow.Text = "⮡ ";
+            labelHIPArrow.Visible = false;
+            // 
             // TransferForm
             // 
             AutoScaleDimensions = new SizeF(7F, 15F);
             AutoScaleMode = AutoScaleMode.Font;
             ClientSize = new Size(602, 340);
+            Controls.Add(labelSendingHIPAddress);
+            Controls.Add(labelHIPArrow);
             Controls.Add(labelError);
             Controls.Add(textBoxAddress);
             Controls.Add(label2);
@@ -143,5 +168,7 @@
         private Label label2;
         private TextBox textBoxAddress;
         private Label labelError;
+        private Label labelSendingHIPAddress;
+        private Label labelHIPArrow;
     }
 }

FireWallet/TransferForm.cs

@@ -8,6 +8,8 @@ using System.Net;
 using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Forms;
+using DnsClient.Protocol;
+using DnsClient;
 using Newtonsoft.Json.Linq;
 
 namespace FireWallet
@@ -46,16 +48,19 @@ namespace FireWallet
             this.Close();
         }
 
+        string address = "";
         private async void buttonTransfer_Click(object sender, EventArgs e)
         {
-            if (!await MainForm.ValidAddress(textBoxAddress.Text))
+            updateAddress();
+
+            if (!await MainForm.ValidAddress(address))
             {
                 labelError.Show();
                 return;
             }
 
             string content = "{\"method\": \"sendtransfer\",\"params\": [ \"" + Domain + "\", \"" +
-    textBoxAddress.Text + "\"]}";
+    address + "\"]}";
             string output = await MainForm.APIPost("", true, content);
             JObject APIresp = JObject.Parse(output);
             if (APIresp["error"].ToString() != "")
@@ -78,14 +83,113 @@ namespace FireWallet
 
         private async void buttonBatch_Click(object sender, EventArgs e)
         {
-            if (!await MainForm.ValidAddress(textBoxAddress.Text))
+            updateAddress();
+
+            if (!await MainForm.ValidAddress(address))
             {
                 labelError.Show();
                 return;
             }
 
-            MainForm.AddBatch(Domain, "TRANSFER", textBoxAddress.Text);
+            MainForm.AddBatch(Domain, "TRANSFER", address);
             this.Close();
         }
+
+        private void updateAddress()
+        {
+            labelError.Hide();
+
+            if (textBoxAddress.Text.Length < 1)
+            {
+                address = "";
+                return;
+            }
+            if (textBoxAddress.Text.Substring(0, 1) == "@")
+            {
+                string domain = textBoxAddress.Text.Substring(1);
+
+                try
+                {
+                    IPAddress iPAddress = null;
+
+
+                    // Create an instance of LookupClient using the custom options
+                    NameServer nameServer = new NameServer(IPAddress.Parse("127.0.0.1"), 5350);
+                    var options = new LookupClientOptions(nameServer);
+                    options.EnableAuditTrail = true;
+                    options.UseTcpOnly = true;
+                    options.Recursion = true;
+                    options.UseCache = false;
+                    options.RequestDnsSecRecords = true;
+                    options.Timeout = TimeSpan.FromSeconds(5);
+
+
+                    var client = new LookupClient(options);
+
+
+                    // Perform the DNS lookup for the specified domain using DNSSec
+
+                    var result = client.Query(domain, QueryType.A);
+
+
+
+
+
+                    // Display the DNS lookup results
+                    foreach (var record in result.Answers.OfType<ARecord>())
+                    {
+                        iPAddress = record.Address;
+                    }
+
+                    if (iPAddress == null)
+                    {
+                        labelError.Show();
+                        labelError.Text = "HIP-02 lookup failed";
+                        return;
+                    }
+
+                    // Get TLSA record
+                    var resultTLSA = client.Query("_443._tcp." + domain, QueryType.TLSA);
+                    foreach (var record in resultTLSA.Answers.OfType<TlsaRecord>())
+                    {
+                        MainForm.TLSA = record.CertificateAssociationDataAsString;
+                    }
+
+
+
+                    string url = "https://" + iPAddress.ToString() + "/.well-known/wallets/HNS";
+                    var handler = new HttpClientHandler();
+
+                    handler.ServerCertificateCustomValidationCallback = MainForm.ValidateServerCertificate;
+
+                    // Create an instance of HttpClient with the custom handler
+                    using (var httpclient = new HttpClient(handler))
+                    {
+                        httpclient.DefaultRequestHeaders.Add("Host", domain);
+                        // Send a GET request to the specified URL
+                        HttpResponseMessage response = httpclient.GetAsync(url).Result;
+
+                        // Response
+                        string address = response.Content.ReadAsStringAsync().Result;
+
+                        labelSendingHIPAddress.Text = address;
+                        this.address = address;
+                        labelSendingHIPAddress.Show();
+                        labelHIPArrow.Show();
+                    }
+
+                }
+                catch (Exception ex)
+                {
+                    MainForm.AddLog(ex.Message);
+                    labelError.Show();
+                    labelError.Text = "HIP-02 lookup failed";
+                }
+            } else
+            {
+                address = textBoxAddress.Text;
+            }
+
+        }
     }
 }

FireWalletSetup/FireWalletSetup.vdproj

@@ -224,15 +224,15 @@
         {
         "Name" = "8:Microsoft Visual Studio"
         "ProductName" = "8:FireWallet"
-        "ProductCode" = "8:{24264791-86B1-49B5-88C9-5042C3FA1BF2}"
-        "PackageCode" = "8:{8CC25786-EE60-4F7F-970E-D122B84DF8B5}"
+        "ProductCode" = "8:{460D8F86-4FE9-4547-9B17-7E01ACBF9194}"
+        "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:2.4"
+        "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
@@ -134,6 +139,15 @@ This file stores the node (HSD/Bob connection) settings.
 The Network is the network you want to connect to (default is `0` for Mainnet).  
 If you delete this file, FireWallet will show the node setup screen on next startup.
 
+You can set a custom HSD launch command by setting the `hsd-command` key.  
+The default launch is the same as this
+```yaml
+HSD-command: {default-dir} --agent=FireWallet --index-tx --index-address --api-key {key} --prefix {Bob}
+```
+The `{default-dir}` will be replaced with the HSD directory `%appdata%\FireWallet\hsd\`.  
+The `{key}` will be replaced with the API key from the node.txt file.  
+The `{Bob}` will be replaced with the Bob wallet HSD data directory `%appdata%\Bob\hsd_data\` this is used to sync FireWallet with Bob's accounts and also stops you needing to sync the chain twice.
+
 ## theme.txt
 This file stores the theme settings.  
 The theme is the color scheme of the application.  
@@ -142,4 +156,10 @@ There are 4 modes: `off` is disabled, `mica` is windows app style, `key` is to m
 
 ## log.txt
 This file stores the logs for the application.  
-You should check this file if you have any issues with the application.
+You should check this file if you have any issues with the application.
+
+
+# Support
+If you have any issues with the application you can open an issue on GitHub or contact me on Discord (NathanWoodburn on most Handshake servers).
+
+If you would like to support this project you can find out how at https://nathan.woodburn.au/#donate or you can help by contributing to the project on GitHub.

example-configs/node.txt

@@ -1,3 +1,5 @@
 IP: 127.0.0.1
 Network: 0
 Key: my-super-secret-api-key
+HSD: False
+HSD-command: {default-dir} --agent=FireWallet --index-tx --index-address --api-key {key} --prefix {Bob}

hsd-ledger

@@ -136,20 +136,14 @@ async function sendRaw(wclient, nclient, config, ledger, args) { // Create a fun
   const network = Network.get(config.str('network')); // Get the network
   const id = config.str('wallet-id'); // Get the wallet id
   const acct = config.str('account-name'); // Get the account name
-  const batch = args[0]; // Get the batch file location
-  const nameslocation = args[1]; // Get the names file location
+  // Log the arguments to the console (for debugging)
 
+  const batch = JSON.parse(args[0]); // Get the batch
+  const names = JSON.parse(args[1]); // Get the names
   await wclient.execute('selectwallet', [id]); // Select the wallet
 
-
-  const fs = require('fs'); // Import fs (used to read files)
   try {
-    const data = fs.readFileSync(batch, 'utf8'); // Read the batch file
-    const json = JSON.parse(data); // Parse the batch file as JSON
-    const mtx = MTX.fromJSON(json.result); // Create a new MTX from the JSON
-
-    const namefile = fs.readFileSync(nameslocation, 'utf8'); // Read the names file
-    const names = namefile.split(','); // Split the names file into an array
+    const mtx = MTX.fromJSON(batch.result); // Create a new MTX from the JSON
     const hashes = {}; // Create an empty object to store the hashes
     for (const name of names) { // Loop through the names
       const hash = hashName(name); // Hash the name
@@ -428,6 +422,7 @@ function usage(err) {
   console.log('  $ hsd-ledger createaccount <account-name> <account-index>');
   console.log('  $ hsd-ledger createaddress');
   console.log('  $ hsd-ledger sendtoaddress <address> <amount>');
+  console.log('  $ hsd-ledger sendraw <batch> <names>');
   console.log('  $ hsd-ledger getwallets');
   console.log('  $ hsd-ledger getaccounts');
   console.log('  $ hsd-ledger getaccount <account-name>');