package: Increased version

- Updated example-configs/batch.txt with new DNS records
- Modified BatchForm.cs to handle new DNS record types

FireWallet/BatchForm.cs

@@ -1,12 +1,10 @@
 using System.Data;
 using System.Diagnostics;
-using System.Linq;
-using System.Net;
 using System.Runtime.InteropServices;
-using System.Security.Principal;
 using System.Text;
-using Microsoft.VisualBasic;
+using System.Windows.Forms.VisualStyles;
 using Newtonsoft.Json.Linq;
+using ContentAlignment = System.Drawing.ContentAlignment;
 using Point = System.Drawing.Point;
 
 namespace FireWallet
@@ -620,7 +618,7 @@ namespace FireWallet
                     }
                     else if (b.method == "UPDATE")
                     {
-                        sw.WriteLine(b.domain + "," + b.method + ",[" + string.Join(", ", b.update.Select(record => record.ToString())) + "]");
+                        sw.WriteLine(b.domain + "," + b.method + ",[" + string.Join(";", b.update.Select(record => record.ToString())) + "]");
                     }
                     else
                     {
@@ -652,14 +650,54 @@ namespace FireWallet
                             {
                                 if (split[1] == "UPDATE")
                                 {
-                                    // Select operation and import domains
-                                    string[] newDomains = new string[domains.Length + 1];
-                                    for (int i = 0; i < domains.Length; i++)
+                                    // Join the rest of the line
+                                    string[] updateArray = new string[split.Length - 2];
+                                    for (int i = 0; i < updateArray.Length; i++)
                                     {
-                                        newDomains[i] = domains[i];
+                                        updateArray[i] = split[i + 2];
                                     }
-                                    newDomains[domains.Length] = split[0];
-                                    domains = newDomains;
+                                    string updateString = string.Join(",", updateArray);
+                                    updateString.TrimStart('[');
+                                    updateString.TrimEnd(']');
+
+                                    string[] updateSplit = updateString.Split(';');
+                                    DNS[] UpdateRecords = new DNS[updateSplit.Length];
+                                    int r = 0;
+                                    foreach (string update in updateSplit)
+                                    {
+                                        string[] updateRecord = update.Split(',');
+                                        string type = updateRecord[0];
+                                        type = type.Split(':')[1].Replace("\"","").Trim();
+                                        switch (type)
+                                        {
+                                            case "NS":
+                                                string ns = updateRecord[1].Split(':')[1].Replace("\"","").Replace("}","").Trim();
+                                                UpdateRecords[r] = new DNS(type, ns);
+                                                break;
+                                            case "DS":
+                                                int keyTag = int.Parse(updateRecord[1].Split(':')[1]);
+                                                int algorithm = int.Parse(updateRecord[2].Split(':')[1]);
+                                                int digestType = int.Parse(updateRecord[3].Split(':')[1]);
+                                                string digest = updateRecord[4].Split(':')[1].Replace("\"", "").Replace("}", "");
+
+                                                UpdateRecords[r] = new DNS(type, keyTag, algorithm, digestType, digest);
+                                                break;
+                                            case "TXT":
+                                                string txt = updateRecord[1].Split(':')[1].Replace("\"", "").Replace("}", "");
+                                                txt = txt.Replace("[", "");
+                                                txt = txt.Replace("]", "");
+                                                UpdateRecords[r] = new DNS(type, new string[] { txt.Trim() });
+                                                break;
+                                            case "GLUE4":
+                                            case "GLUE6":
+                                                string nsGlue = updateRecord[1].Split(':')[1].Replace("\"", "").Trim();
+                                                string address = updateRecord[2].Split(':')[1].Replace("\"", "").Replace("}", "").Trim();
+                                                UpdateRecords[r] = new DNS(type, nsGlue, address);
+                                                break;
+                                        }
+                                        r++;
+                                    }
+                                    AddBatch(split[0], split[1], UpdateRecords);
                                     continue;
                                 }
                             }

FireWallet/FireWallet.csproj

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

FireWallet/MainForm.Designer.cs

@@ -45,6 +45,8 @@ namespace FireWallet
             githubToolStripMenuItem = new ToolStripMenuItem();
             websiteToolStripMenuItem = new ToolStripMenuItem();
             supportDiscordServerToolStripMenuItem = new ToolStripMenuItem();
+            toolStripSeparator1 = new ToolStripSeparator();
+            otherProjectsToolStripMenuItem = new ToolStripMenuItem();
             timerNodeStatus = new System.Windows.Forms.Timer(components);
             panelaccount = new Panel();
             groupBoxaccount = new GroupBox();
@@ -124,8 +126,6 @@ namespace FireWallet
             textBoxExAddr = new TextBox();
             labelSettings4 = new Label();
             textBoxExTX = new TextBox();
-            toolStripSeparator1 = new ToolStripSeparator();
-            otherProjectsToolStripMenuItem = new ToolStripMenuItem();
             statusStripmain.SuspendLayout();
             panelaccount.SuspendLayout();
             groupBoxaccount.SuspendLayout();
@@ -233,6 +233,18 @@ namespace FireWallet
             supportDiscordServerToolStripMenuItem.Text = "Support Discord Server";
             supportDiscordServerToolStripMenuItem.Click += supportDiscordServerToolStripMenuItem_Click;
             // 
+            // toolStripSeparator1
+            // 
+            toolStripSeparator1.Name = "toolStripSeparator1";
+            toolStripSeparator1.Size = new Size(191, 6);
+            // 
+            // otherProjectsToolStripMenuItem
+            // 
+            otherProjectsToolStripMenuItem.Name = "otherProjectsToolStripMenuItem";
+            otherProjectsToolStripMenuItem.Size = new Size(194, 22);
+            otherProjectsToolStripMenuItem.Text = "Other Projects";
+            otherProjectsToolStripMenuItem.Click += otherProjectsToolStripMenuItem_Click;
+            // 
             // timerNodeStatus
             // 
             timerNodeStatus.Enabled = true;
@@ -437,7 +449,7 @@ namespace FireWallet
             panelPortfolio.Controls.Add(groupBoxTransactions);
             panelPortfolio.Controls.Add(groupBoxinfo);
             panelPortfolio.Controls.Add(groupBoxbalance);
-            panelPortfolio.Location = new Point(1065, 80);
+            panelPortfolio.Location = new Point(140, 35);
             panelPortfolio.Name = "panelPortfolio";
             panelPortfolio.Size = new Size(956, 538);
             panelPortfolio.TabIndex = 7;
@@ -576,7 +588,7 @@ namespace FireWallet
             panelSend.Controls.Add(labelSendingTo);
             panelSend.Controls.Add(labelSendPrompt);
             panelSend.Controls.Add(labelHIPArrow);
-            panelSend.Location = new Point(138, 33);
+            panelSend.Location = new Point(1041, 235);
             panelSend.Name = "panelSend";
             panelSend.Size = new Size(974, 521);
             panelSend.TabIndex = 2;
@@ -794,7 +806,7 @@ namespace FireWallet
             panelDomains.Controls.Add(groupBoxDomains);
             panelDomains.Controls.Add(labelDomainSearch);
             panelDomains.Controls.Add(textBoxDomainSearch);
-            panelDomains.Location = new Point(120, 48);
+            panelDomains.Location = new Point(1122, 35);
             panelDomains.Name = "panelDomains";
             panelDomains.Size = new Size(920, 536);
             panelDomains.TabIndex = 18;
@@ -1093,18 +1105,6 @@ namespace FireWallet
             textBoxExTX.Size = new Size(307, 29);
             textBoxExTX.TabIndex = 1;
             // 
-            // toolStripSeparator1
-            // 
-            toolStripSeparator1.Name = "toolStripSeparator1";
-            toolStripSeparator1.Size = new Size(191, 6);
-            // 
-            // otherProjectsToolStripMenuItem
-            // 
-            otherProjectsToolStripMenuItem.Name = "otherProjectsToolStripMenuItem";
-            otherProjectsToolStripMenuItem.Size = new Size(194, 22);
-            otherProjectsToolStripMenuItem.Text = "Other Projects";
-            otherProjectsToolStripMenuItem.Click += otherProjectsToolStripMenuItem_Click;
-            // 
             // MainForm
             // 
             AutoScaleDimensions = new SizeF(7F, 15F);
@@ -1124,6 +1124,7 @@ namespace FireWallet
             Text = "FireWallet";
             FormClosing += MainForm_Closing;
             Load += MainForm_Load;
+            ResizeEnd += MainForm_ResizeEnd;
             Resize += Form1_Resize;
             statusStripmain.ResumeLayout(false);
             statusStripmain.PerformLayout();

FireWallet/MainForm.cs

@@ -7,8 +7,6 @@ using QRCoder;
 using System.Text.RegularExpressions;
 using System.Security.Cryptography;
 using System.Text;
-using System.Security.Policy;
-using System.Windows.Forms;
 using System.Net;
 using DnsClient;
 using DnsClient.Protocol;
@@ -130,7 +128,7 @@ namespace FireWallet
                     // Wait until the Node is connected before closing the splash
                     while (true)
                     {
-                        string status = await APIGet("",false);
+                        string status = await APIGet("", false);
                         if (status != "Error")
                         {
                             ss.CloseSplash();
@@ -622,6 +620,10 @@ namespace FireWallet
             [DllImport("user32.dll")]
             internal static extern int SetWindowCompositionAttribute(IntPtr hwnd, ref WindowCompositionAttributeData data);
         }
+        private void MainForm_ResizeEnd(object sender, EventArgs e)
+        {
+            ResizeForm();
+        }
         private void Form1_Resize(object sender, EventArgs e)
         {
             ResizeForm();
@@ -633,9 +635,33 @@ namespace FireWallet
             groupBoxDomains.Width = panelDomains.Width - 20;
             groupBoxDomains.Left = 10;
             groupBoxDomains.Height = panelDomains.Height - groupBoxDomains.Top - 10;
-
             buttonNavSettings.Top = panelNav.Height - buttonNavSettings.Height - 10;
             buttonSettingsSave.Top = panelSettings.Height - buttonSettingsSave.Height - 10;
+            groupBoxTransactions.Height = panelPortfolio.Height - groupBoxbalance.Height - 10;
+
+            // SEND Page
+            labelSendPrompt.Left = (panelSend.Width - labelSendPrompt.Width) / 2;
+            buttonSendHNS.Left = (panelSend.Width - buttonSendHNS.Width) / 2;
+            labelSendingTo.Left = (panelSend.Width - labelSendingTo.Width - textBoxSendingTo.Width) / 2;
+            labelSendingAmount.Left = labelSendingTo.Left;
+            textBoxSendingTo.Left = labelSendingTo.Left + labelSendingTo.Width + 10;
+            textBoxSendingAmount.Left = textBoxSendingTo.Left;
+            labelSendingMax.Left = labelSendingTo.Left;
+            labelSendingError.Left = textBoxSendingTo.Left + textBoxSendingTo.Width + 10;
+            labelSendingFee.Left = labelSendingTo.Left;
+            buttonSendMax.Left = textBoxSendingAmount.Left + textBoxSendingAmount.Width - buttonSendMax.Width;
+            checkBoxSendSubFee.Left = labelSendingTo.Left;
+
+            // RECEIVE Page
+            labelReceive1.Left = (panelRecieve.Width - labelReceive1.Width) / 2;
+            labelReceive2.Left = (panelRecieve.Width - labelReceive2.Width) / 2;
+            textBoxReceiveAddress.Left = (panelRecieve.Width - textBoxReceiveAddress.Width) / 2;
+            Size size = TextRenderer.MeasureText(textBoxReceiveAddress.Text, textBoxReceiveAddress.Font);
+            textBoxReceiveAddress.Width = size.Width + 10;
+            textBoxReceiveAddress.Left = (panelRecieve.Width - textBoxReceiveAddress.Width) / 2;
+            pictureBoxReceiveQR.Width = panelRecieve.Width / 3;
+            pictureBoxReceiveQR.Left = (panelRecieve.Width - pictureBoxReceiveQR.Width) / 2;
+
         }
         #endregion
         #region Accounts
@@ -1195,6 +1221,7 @@ namespace FireWallet
                 buttonNavPortfolio.BackColor = ColorTranslator.FromHtml(Theme["selected-bg"]);
                 buttonNavPortfolio.ForeColor = ColorTranslator.FromHtml(Theme["selected-fg"]);
             }
+            groupBoxTransactions.Height = panelPortfolio.Height - groupBoxbalance.Height - 10;
         }
 
         private async void SendPanel_Click(object sender, EventArgs e)
@@ -1260,9 +1287,6 @@ namespace FireWallet
             pictureBoxReceiveQR.SizeMode = PictureBoxSizeMode.Zoom;
             pictureBoxReceiveQR.Width = panelRecieve.Width / 3;
             pictureBoxReceiveQR.Left = (panelRecieve.Width - pictureBoxReceiveQR.Width) / 2;
-
-
-
         }
         private void buttonNavDomains_Click(object sender, EventArgs e)
         {
@@ -1355,7 +1379,8 @@ namespace FireWallet
                     if (UserSettings.ContainsKey("hip-02-port"))
                     {
                         port = int.Parse(UserSettings["hip-02-port"]);
-                    } else if (!HSD)
+                    }
+                    else if (!HSD)
                     {
                         string bobPath = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) + "\\Bob\\hsd_data";
                         if (Directory.Exists(bobPath))
@@ -1436,7 +1461,7 @@ namespace FireWallet
                         {
                             labelSendingError.Show();
                             labelSendingError.Text = "Invalid Address";
-                            AddLog("Invalid Address\n"+address);
+                            AddLog("Invalid Address\n" + address);
 
                         }
 
@@ -2289,7 +2314,6 @@ namespace FireWallet
 
         }
         #endregion
-
         #region Help Menu
         private void githubToolStripMenuItem_Click(object sender, EventArgs e)
         {

FireWalletSetup/FireWalletSetup.vdproj

@@ -224,15 +224,15 @@
         {
         "Name" = "8:Microsoft Visual Studio"
         "ProductName" = "8:FireWallet"
-        "ProductCode" = "8:{C4D699E7-B668-48CD-AC78-920E852B98D9}"
-        "PackageCode" = "8:{38D2B4D2-E8BA-43AF-8475-F0E70AD733FE}"
+        "ProductCode" = "8:{C118B90C-B5A0-4015-B03A-FB226DC02F54}"
+        "PackageCode" = "8:{FF49B317-BBC1-40D9-9AFF-315E3AEED79C}"
         "UpgradeCode" = "8:{0C86F725-6B01-4173-AA05-3F0EDF481362}"
         "AspNetVersion" = "8:"
         "RestartWWWService" = "11:FALSE"
         "RemovePreviousVersions" = "11:TRUE"
         "DetectNewerInstalledVersion" = "11:TRUE"
         "InstallAllUsers" = "11:FALSE"
-        "ProductVersion" = "8:3.2"
+        "ProductVersion" = "8:3.3"
         "Manufacturer" = "8:Nathan.Woodburn/"
         "ARPHELPTELEPHONE" = "8:"
         "ARPHELPLINK" = "8:https://l.woodburn.au/discord"

README.md

@@ -113,9 +113,6 @@ You can add transactions to the batch from the domain window or the DNS editor.
 You can also import a list of domains to the batch window.  
 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)
 

example-configs/batch.txt

@@ -6,4 +6,4 @@ woodburn4,BID,1,3
 woodburn5,BID,1,3
 woodburn6,BID,1,4
 woodburn8,TRANSFER,hs1qlmlgnx0g3ynk4ylxkkdh9c9nernclnfq4lw6s9
-exampledomainnathan118,UPDATE,[{"type": "DS","keyTag": 20167,"algorithm": 13,"digestType": 2,"digest":"4a2ab3224727a4754a6c3d77621a5b04241a3d9c7ae7e5fa17f73121b9ff0e06"}, {"type": "NS","ns": "ns1.woodburn."}, {"type": "NS","ns": "ns2.woodburn."}, {"type": "TXT","txt": ["TEST"]}]
+exampledomainnathan90,UPDATE,[{"type": "NS","ns": "ns1.woodburn."};{"type": "NS","ns": "ns2.woodburn."};{"type": "DS","keyTag": 30273,"algorithm": 13,"digestType": 2,"digest":"9a3a8fb3d625d2a2073d740f10da6056ebed0e97f550aa7f3891ed450c7e60c9"};{"type": "GLUE4","ns": "ns1.exampledomainnathan90.","address": "1.2.3.4"};{"type": "TXT","txt": ["Test TXT record"]}]