From eade6c67b5142b3f3739221352231d13e6d36177 Mon Sep 17 00:00:00 2001 From: embii Date: Mon, 23 Oct 2017 21:15:43 -0700 Subject: [PATCH] Apertus v0.3.13-beta Release Updated copyright to 2017 :dancer: Prevent Profile creation if coin type is Variable because tracking addresses cannot be used. Hide Variable .SIG file found information. fixed linking issues betwen DTC and DTC-V by making getrawdatatransaction default call type --- ADD/About.Designer.cs | 4 +- ADD/Main.Designer.cs | 214 +++++++++--------- ADD/Main.cs | 51 +++-- ADD/Properties/AssemblyInfo.cs | 4 +- ADD/RPC/BlockchainRPC.Methods.cs | 13 -- ADD/RPC/Response/GetRawTransactionResponse.cs | 50 +--- 6 files changed, 139 insertions(+), 197 deletions(-) diff --git a/ADD/About.Designer.cs b/ADD/About.Designer.cs index ecf9966..9ff980f 100644 --- a/ADD/About.Designer.cs +++ b/ADD/About.Designer.cs @@ -57,7 +57,7 @@ private void InitializeComponent() this.lblVersion.Name = "lblVersion"; this.lblVersion.Size = new System.Drawing.Size(217, 25); this.lblVersion.TabIndex = 2; - this.lblVersion.Text = "Version: v0.3.12-beta"; + this.lblVersion.Text = "Version: v0.3.13-beta"; // // label1 // @@ -67,7 +67,7 @@ private void InitializeComponent() this.label1.Name = "label1"; this.label1.Size = new System.Drawing.Size(364, 25); this.label1.TabIndex = 3; - this.label1.Text = "Copyright © 2013 - 2016 HugPuddle"; + this.label1.Text = "Copyright © 2013 - 2017 HugPuddle"; // // textBox1 // diff --git a/ADD/Main.Designer.cs b/ADD/Main.Designer.cs index 79eb079..5b37b61 100644 --- a/ADD/Main.Designer.cs +++ b/ADD/Main.Designer.cs @@ -29,11 +29,11 @@ protected override void Dispose(bool disposing) private void InitializeComponent() { this.components = new System.ComponentModel.Container(); - System.Windows.Forms.TreeNode treeNode21 = new System.Windows.Forms.TreeNode("Profile"); - System.Windows.Forms.TreeNode treeNode22 = new System.Windows.Forms.TreeNode("Signature"); - System.Windows.Forms.TreeNode treeNode23 = new System.Windows.Forms.TreeNode("Vault"); - System.Windows.Forms.TreeNode treeNode24 = new System.Windows.Forms.TreeNode("Favorites"); - System.Windows.Forms.TreeNode treeNode25 = new System.Windows.Forms.TreeNode("Follow"); + System.Windows.Forms.TreeNode treeNode1 = new System.Windows.Forms.TreeNode("Profile"); + System.Windows.Forms.TreeNode treeNode2 = new System.Windows.Forms.TreeNode("Signature"); + System.Windows.Forms.TreeNode treeNode3 = new System.Windows.Forms.TreeNode("Vault"); + System.Windows.Forms.TreeNode treeNode4 = new System.Windows.Forms.TreeNode("Favorites"); + System.Windows.Forms.TreeNode treeNode5 = new System.Windows.Forms.TreeNode("Follow"); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Main)); this.attachFiles = new System.Windows.Forms.OpenFileDialog(); this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(this.components); @@ -112,6 +112,7 @@ private void InitializeComponent() this.btnAddVault = new System.Windows.Forms.Button(); this.btnAddFolder = new System.Windows.Forms.Button(); this.splitHistoryBrowser = new System.Windows.Forms.SplitContainer(); + this.totalResults = new System.Windows.Forms.NumericUpDown(); this.imgTip = new System.Windows.Forms.PictureBox(); this.imgLink = new System.Windows.Forms.PictureBox(); this.imgFriend = new System.Windows.Forms.PictureBox(); @@ -131,7 +132,6 @@ private void InitializeComponent() this.backgroundWorker1 = new System.ComponentModel.BackgroundWorker(); this.timer1 = new System.Windows.Forms.Timer(this.components); this.tmrPauseBeforeRefreshingMonitor = new System.Windows.Forms.Timer(this.components); - this.totalResults = new System.Windows.Forms.NumericUpDown(); this.contextMenuStrip1.SuspendLayout(); this.menuMain.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.splitMain)).BeginInit(); @@ -156,6 +156,7 @@ private void InitializeComponent() this.splitHistoryBrowser.Panel1.SuspendLayout(); this.splitHistoryBrowser.Panel2.SuspendLayout(); this.splitHistoryBrowser.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.totalResults)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.imgTip)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.imgLink)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.imgFriend)).BeginInit(); @@ -168,7 +169,6 @@ private void InitializeComponent() ((System.ComponentModel.ISupportInitialize)(this.imgOpenRight)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.imgApertusSplash)).BeginInit(); this.statusArchiveStatus.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.totalResults)).BeginInit(); this.SuspendLayout(); // // attachFiles @@ -182,18 +182,18 @@ private void InitializeComponent() this.blockToolStripMenuItem, this.followToolStripMenuItem}); this.contextMenuStrip1.Name = "contextMenuStrip1"; - this.contextMenuStrip1.Size = new System.Drawing.Size(181, 80); + this.contextMenuStrip1.Size = new System.Drawing.Size(156, 76); // // blockToolStripMenuItem // this.blockToolStripMenuItem.Name = "blockToolStripMenuItem"; - this.blockToolStripMenuItem.Size = new System.Drawing.Size(180, 38); + this.blockToolStripMenuItem.Size = new System.Drawing.Size(155, 36); this.blockToolStripMenuItem.Text = "block"; // // followToolStripMenuItem // this.followToolStripMenuItem.Name = "followToolStripMenuItem"; - this.followToolStripMenuItem.Size = new System.Drawing.Size(180, 38); + this.followToolStripMenuItem.Size = new System.Drawing.Size(155, 36); this.followToolStripMenuItem.Text = "follow"; // // menuMain @@ -207,7 +207,7 @@ private void InitializeComponent() this.menuMain.Location = new System.Drawing.Point(0, 0); this.menuMain.Name = "menuMain"; this.menuMain.Padding = new System.Windows.Forms.Padding(7, 2, 0, 2); - this.menuMain.Size = new System.Drawing.Size(1958, 37); + this.menuMain.Size = new System.Drawing.Size(1958, 42); this.menuMain.TabIndex = 0; this.menuMain.Text = "menuStrip1"; // @@ -219,13 +219,13 @@ private void InitializeComponent() this.notarizeToolStripMenuItem, this.exitToolStripMenuItem}); this.fileToolStripMenuItem.Name = "fileToolStripMenuItem"; - this.fileToolStripMenuItem.Size = new System.Drawing.Size(66, 33); + this.fileToolStripMenuItem.Size = new System.Drawing.Size(66, 38); this.fileToolStripMenuItem.Text = "File"; // // newToolStripMenuItem // this.newToolStripMenuItem.Name = "newToolStripMenuItem"; - this.newToolStripMenuItem.Size = new System.Drawing.Size(194, 38); + this.newToolStripMenuItem.Size = new System.Drawing.Size(193, 38); this.newToolStripMenuItem.Text = "New"; this.newToolStripMenuItem.Click += new System.EventHandler(this.newToolStripMenuItem_Click); // @@ -234,13 +234,13 @@ private void InitializeComponent() this.historyToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.rebuildToolStripMenuItem1}); this.historyToolStripMenuItem.Name = "historyToolStripMenuItem"; - this.historyToolStripMenuItem.Size = new System.Drawing.Size(194, 38); + this.historyToolStripMenuItem.Size = new System.Drawing.Size(193, 38); this.historyToolStripMenuItem.Text = "Catalog"; // // rebuildToolStripMenuItem1 // this.rebuildToolStripMenuItem1.Name = "rebuildToolStripMenuItem1"; - this.rebuildToolStripMenuItem1.Size = new System.Drawing.Size(195, 38); + this.rebuildToolStripMenuItem1.Size = new System.Drawing.Size(194, 38); this.rebuildToolStripMenuItem1.Text = "Rebuild"; this.rebuildToolStripMenuItem1.Click += new System.EventHandler(this.rebuildToolStripMenuItem_Click); // @@ -250,14 +250,14 @@ private void InitializeComponent() this.proofToolStripMenuItem, this.searchToolStripMenuItem}); this.notarizeToolStripMenuItem.Name = "notarizeToolStripMenuItem"; - this.notarizeToolStripMenuItem.Size = new System.Drawing.Size(194, 38); + this.notarizeToolStripMenuItem.Size = new System.Drawing.Size(193, 38); this.notarizeToolStripMenuItem.Text = "Proof"; // // proofToolStripMenuItem // this.proofToolStripMenuItem.Enabled = false; this.proofToolStripMenuItem.Name = "proofToolStripMenuItem"; - this.proofToolStripMenuItem.Size = new System.Drawing.Size(187, 38); + this.proofToolStripMenuItem.Size = new System.Drawing.Size(186, 38); this.proofToolStripMenuItem.Text = "Insert"; this.proofToolStripMenuItem.Click += new System.EventHandler(this.notarizeToolStripMenuItem_Click); // @@ -268,28 +268,28 @@ private void InitializeComponent() this.hashToolStripMenuItem}); this.searchToolStripMenuItem.Enabled = false; this.searchToolStripMenuItem.Name = "searchToolStripMenuItem"; - this.searchToolStripMenuItem.Size = new System.Drawing.Size(187, 38); + this.searchToolStripMenuItem.Size = new System.Drawing.Size(186, 38); this.searchToolStripMenuItem.Text = "Search"; this.searchToolStripMenuItem.Click += new System.EventHandler(this.searchToolStripMenuItem_Click); // // fileToolStripMenuItem1 // this.fileToolStripMenuItem1.Name = "fileToolStripMenuItem1"; - this.fileToolStripMenuItem1.Size = new System.Drawing.Size(166, 38); + this.fileToolStripMenuItem1.Size = new System.Drawing.Size(165, 38); this.fileToolStripMenuItem1.Text = "File"; this.fileToolStripMenuItem1.Click += new System.EventHandler(this.fileToolStripMenuItem1_Click); // // hashToolStripMenuItem // this.hashToolStripMenuItem.Name = "hashToolStripMenuItem"; - this.hashToolStripMenuItem.Size = new System.Drawing.Size(166, 38); + this.hashToolStripMenuItem.Size = new System.Drawing.Size(165, 38); this.hashToolStripMenuItem.Text = "Hash"; this.hashToolStripMenuItem.Click += new System.EventHandler(this.hashToolStripMenuItem_Click); // // exitToolStripMenuItem // this.exitToolStripMenuItem.Name = "exitToolStripMenuItem"; - this.exitToolStripMenuItem.Size = new System.Drawing.Size(194, 38); + this.exitToolStripMenuItem.Size = new System.Drawing.Size(193, 38); this.exitToolStripMenuItem.Text = "Exit"; this.exitToolStripMenuItem.Click += new System.EventHandler(this.exitToolStripMenuItem_Click); // @@ -301,35 +301,35 @@ private void InitializeComponent() this.fontToolStripMenuItem, this.trustToolStripMenuItem}); this.settingsToolStripMenuItem.Name = "settingsToolStripMenuItem"; - this.settingsToolStripMenuItem.Size = new System.Drawing.Size(112, 33); + this.settingsToolStripMenuItem.Size = new System.Drawing.Size(112, 38); this.settingsToolStripMenuItem.Text = "Settings"; // // profilesToolStripMenuItem // this.profilesToolStripMenuItem.Enabled = false; this.profilesToolStripMenuItem.Name = "profilesToolStripMenuItem"; - this.profilesToolStripMenuItem.Size = new System.Drawing.Size(244, 38); + this.profilesToolStripMenuItem.Size = new System.Drawing.Size(268, 38); this.profilesToolStripMenuItem.Text = "Profiles"; this.profilesToolStripMenuItem.Click += new System.EventHandler(this.profilesToolStripMenuItem_Click); // // walletsToolStripMenuItem // this.walletsToolStripMenuItem.Name = "walletsToolStripMenuItem"; - this.walletsToolStripMenuItem.Size = new System.Drawing.Size(244, 38); + this.walletsToolStripMenuItem.Size = new System.Drawing.Size(268, 38); this.walletsToolStripMenuItem.Text = "Wallets"; this.walletsToolStripMenuItem.Click += new System.EventHandler(this.walletsToolStripMenuItem_Click); // // fontToolStripMenuItem // this.fontToolStripMenuItem.Name = "fontToolStripMenuItem"; - this.fontToolStripMenuItem.Size = new System.Drawing.Size(244, 38); + this.fontToolStripMenuItem.Size = new System.Drawing.Size(268, 38); this.fontToolStripMenuItem.Text = "Font"; this.fontToolStripMenuItem.Click += new System.EventHandler(this.fontToolStripMenuItem_Click); // // trustToolStripMenuItem // this.trustToolStripMenuItem.Name = "trustToolStripMenuItem"; - this.trustToolStripMenuItem.Size = new System.Drawing.Size(244, 38); + this.trustToolStripMenuItem.Size = new System.Drawing.Size(268, 38); this.trustToolStripMenuItem.Text = "Trust Center"; this.trustToolStripMenuItem.Click += new System.EventHandler(this.trustToolStripMenuItem_Click); // @@ -339,20 +339,20 @@ private void InitializeComponent() this.aboutToolStripMenuItem, this.rPCToolStripMenuItem}); this.helpToolStripMenuItem.Name = "helpToolStripMenuItem"; - this.helpToolStripMenuItem.Size = new System.Drawing.Size(76, 33); + this.helpToolStripMenuItem.Size = new System.Drawing.Size(76, 38); this.helpToolStripMenuItem.Text = "Help"; // // aboutToolStripMenuItem // this.aboutToolStripMenuItem.Name = "aboutToolStripMenuItem"; - this.aboutToolStripMenuItem.Size = new System.Drawing.Size(173, 38); + this.aboutToolStripMenuItem.Size = new System.Drawing.Size(172, 38); this.aboutToolStripMenuItem.Text = "About"; this.aboutToolStripMenuItem.Click += new System.EventHandler(this.aboutToolStripMenuItem_Click); // // rPCToolStripMenuItem // this.rPCToolStripMenuItem.Name = "rPCToolStripMenuItem"; - this.rPCToolStripMenuItem.Size = new System.Drawing.Size(173, 38); + this.rPCToolStripMenuItem.Size = new System.Drawing.Size(172, 38); this.rPCToolStripMenuItem.Text = "Info"; this.rPCToolStripMenuItem.Click += new System.EventHandler(this.rPCToolStripMenuItem_Click); // @@ -410,8 +410,8 @@ private void InitializeComponent() // this.splitMain.Panel2.Controls.Add(this.splitArchiveTools); this.splitMain.Panel2MinSize = 0; - this.splitMain.Size = new System.Drawing.Size(858, 1152); - this.splitMain.SplitterDistance = 427; + this.splitMain.Size = new System.Drawing.Size(858, 1147); + this.splitMain.SplitterDistance = 425; this.splitMain.SplitterWidth = 10; this.splitMain.TabIndex = 23; this.splitMain.SplitterMoved += new System.Windows.Forms.SplitterEventHandler(this.splitContainer1_SplitterMoved); @@ -421,7 +421,7 @@ private void InitializeComponent() this.imgOpenUp.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.imgOpenUp.BackColor = System.Drawing.Color.Transparent; this.imgOpenUp.Image = global::ADD.Properties.Resources.OpenUp; - this.imgOpenUp.Location = new System.Drawing.Point(814, 374); + this.imgOpenUp.Location = new System.Drawing.Point(814, 372); this.imgOpenUp.Name = "imgOpenUp"; this.imgOpenUp.Size = new System.Drawing.Size(33, 41); this.imgOpenUp.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; @@ -451,23 +451,23 @@ private void InitializeComponent() this.treeView1.Font = new System.Drawing.Font("Arial", 10.875F); this.treeView1.Location = new System.Drawing.Point(11, 63); this.treeView1.Name = "treeView1"; - treeNode21.Name = "profile"; - treeNode21.Text = "Profile"; - treeNode22.Name = "signature"; - treeNode22.Text = "Signature"; - treeNode23.Name = "vault"; - treeNode23.Text = "Vault"; - treeNode24.Name = "favorites"; - treeNode24.Text = "Favorites"; - treeNode25.Name = "follow"; - treeNode25.Text = "Follow"; + treeNode1.Name = "profile"; + treeNode1.Text = "Profile"; + treeNode2.Name = "signature"; + treeNode2.Text = "Signature"; + treeNode3.Name = "vault"; + treeNode3.Text = "Vault"; + treeNode4.Name = "favorites"; + treeNode4.Text = "Favorites"; + treeNode5.Name = "follow"; + treeNode5.Text = "Follow"; this.treeView1.Nodes.AddRange(new System.Windows.Forms.TreeNode[] { - treeNode21, - treeNode22, - treeNode23, - treeNode24, - treeNode25}); - this.treeView1.Size = new System.Drawing.Size(836, 305); + treeNode1, + treeNode2, + treeNode3, + treeNode4, + treeNode5}); + this.treeView1.Size = new System.Drawing.Size(836, 303); this.treeView1.TabIndex = 5; this.treeView1.AfterSelect += new System.Windows.Forms.TreeViewEventHandler(this.treeView1_AfterSelect); this.treeView1.DoubleClick += new System.EventHandler(this.treeView1_DoubleClick); @@ -496,7 +496,7 @@ private void InitializeComponent() this.cmbFollow.Enabled = false; this.cmbFollow.Font = new System.Drawing.Font("Arial", 10.875F); this.cmbFollow.FormattingEnabled = true; - this.cmbFollow.Location = new System.Drawing.Point(13, 374); + this.cmbFollow.Location = new System.Drawing.Point(13, 372); this.cmbFollow.MaxDropDownItems = 100; this.cmbFollow.Name = "cmbFollow"; this.cmbFollow.Size = new System.Drawing.Size(795, 41); @@ -542,8 +542,8 @@ private void InitializeComponent() this.splitArchiveTools.Panel2.Controls.Add(this.btnAddVault); this.splitArchiveTools.Panel2.Controls.Add(this.btnAddFolder); this.splitArchiveTools.Panel2MinSize = 155; - this.splitArchiveTools.Size = new System.Drawing.Size(858, 715); - this.splitArchiveTools.SplitterDistance = 269; + this.splitArchiveTools.Size = new System.Drawing.Size(858, 712); + this.splitArchiveTools.SplitterDistance = 267; this.splitArchiveTools.SplitterWidth = 10; this.splitArchiveTools.TabIndex = 33; this.splitArchiveTools.SplitterMoved += new System.Windows.Forms.SplitterEventHandler(this.splitContainer5_SplitterMoved); @@ -553,7 +553,7 @@ private void InitializeComponent() this.imgOptionsOpen.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.imgOptionsOpen.BackColor = System.Drawing.Color.Transparent; this.imgOptionsOpen.Image = global::ADD.Properties.Resources.OpenUp; - this.imgOptionsOpen.Location = new System.Drawing.Point(816, 218); + this.imgOptionsOpen.Location = new System.Drawing.Point(816, 216); this.imgOptionsOpen.Name = "imgOptionsOpen"; this.imgOptionsOpen.Size = new System.Drawing.Size(33, 41); this.imgOptionsOpen.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; @@ -571,7 +571,7 @@ private void InitializeComponent() this.imgEnterMessageHere.Image = ((System.Drawing.Image)(resources.GetObject("imgEnterMessageHere.Image"))); this.imgEnterMessageHere.Location = new System.Drawing.Point(97, 74); this.imgEnterMessageHere.Name = "imgEnterMessageHere"; - this.imgEnterMessageHere.Size = new System.Drawing.Size(674, 74); + this.imgEnterMessageHere.Size = new System.Drawing.Size(674, 72); this.imgEnterMessageHere.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom; this.imgEnterMessageHere.TabIndex = 29; this.imgEnterMessageHere.TabStop = false; @@ -621,7 +621,7 @@ private void InitializeComponent() this.txtMessage.MaxLength = 1024000000; this.txtMessage.Multiline = true; this.txtMessage.Name = "txtMessage"; - this.txtMessage.Size = new System.Drawing.Size(836, 108); + this.txtMessage.Size = new System.Drawing.Size(836, 106); this.txtMessage.TabIndex = 5; this.txtMessage.TextChanged += new System.EventHandler(this.txtMessage_TextChanged); this.txtMessage.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txtMessage_KeyDown); @@ -632,7 +632,7 @@ private void InitializeComponent() this.btnAttachFile.Enabled = false; this.btnAttachFile.FlatAppearance.BorderSize = 0; this.btnAttachFile.Font = new System.Drawing.Font("Arial", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.btnAttachFile.Location = new System.Drawing.Point(118, 218); + this.btnAttachFile.Location = new System.Drawing.Point(118, 216); this.btnAttachFile.Margin = new System.Windows.Forms.Padding(0); this.btnAttachFile.Name = "btnAttachFile"; this.btnAttachFile.Size = new System.Drawing.Size(86, 41); @@ -650,7 +650,7 @@ private void InitializeComponent() this.cmbTo.FlatStyle = System.Windows.Forms.FlatStyle.System; this.cmbTo.Font = new System.Drawing.Font("Arial", 10.875F); this.cmbTo.FormattingEnabled = true; - this.cmbTo.Location = new System.Drawing.Point(118, 170); + this.cmbTo.Location = new System.Drawing.Point(118, 168); this.cmbTo.MaxDropDownItems = 100; this.cmbTo.Name = "cmbTo"; this.cmbTo.Size = new System.Drawing.Size(729, 41); @@ -663,7 +663,7 @@ private void InitializeComponent() this.btnArchive.Enabled = false; this.btnArchive.FlatAppearance.BorderSize = 0; this.btnArchive.Font = new System.Drawing.Font("Arial", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.btnArchive.Location = new System.Drawing.Point(11, 218); + this.btnArchive.Location = new System.Drawing.Point(11, 216); this.btnArchive.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.btnArchive.Name = "btnArchive"; this.btnArchive.Size = new System.Drawing.Size(100, 41); @@ -679,7 +679,7 @@ private void InitializeComponent() | System.Windows.Forms.AnchorStyles.Right))); this.txtFileName.Enabled = false; this.txtFileName.Font = new System.Drawing.Font("Arial", 10.875F); - this.txtFileName.Location = new System.Drawing.Point(214, 218); + this.txtFileName.Location = new System.Drawing.Point(214, 216); this.txtFileName.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4); this.txtFileName.Multiline = true; this.txtFileName.Name = "txtFileName"; @@ -691,7 +691,7 @@ private void InitializeComponent() // this.btnFriendEncryption.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.btnFriendEncryption.Enabled = false; - this.btnFriendEncryption.Location = new System.Drawing.Point(13, 170); + this.btnFriendEncryption.Location = new System.Drawing.Point(13, 168); this.btnFriendEncryption.Name = "btnFriendEncryption"; this.btnFriendEncryption.Size = new System.Drawing.Size(98, 41); this.btnFriendEncryption.TabIndex = 50; @@ -770,7 +770,7 @@ private void InitializeComponent() this.flowLayoutPanel1.Location = new System.Drawing.Point(13, 149); this.flowLayoutPanel1.Name = "flowLayoutPanel1"; this.flowLayoutPanel1.Padding = new System.Windows.Forms.Padding(20); - this.flowLayoutPanel1.Size = new System.Drawing.Size(834, 253); + this.flowLayoutPanel1.Size = new System.Drawing.Size(834, 246); this.flowLayoutPanel1.TabIndex = 33; // // groupBox1 @@ -1075,7 +1075,7 @@ private void InitializeComponent() this.splitHistoryBrowser.BackColor = System.Drawing.Color.White; this.splitHistoryBrowser.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.splitHistoryBrowser.Dock = System.Windows.Forms.DockStyle.Fill; - this.splitHistoryBrowser.Location = new System.Drawing.Point(0, 37); + this.splitHistoryBrowser.Location = new System.Drawing.Point(0, 42); this.splitHistoryBrowser.Name = "splitHistoryBrowser"; // // splitHistoryBrowser.Panel1 @@ -1100,18 +1100,48 @@ private void InitializeComponent() this.splitHistoryBrowser.Panel2.Controls.Add(this.imgBackButton); this.splitHistoryBrowser.Panel2.Controls.Add(this.panel1); this.splitHistoryBrowser.Panel2MinSize = 0; - this.splitHistoryBrowser.Size = new System.Drawing.Size(1958, 1152); + this.splitHistoryBrowser.Size = new System.Drawing.Size(1958, 1147); this.splitHistoryBrowser.SplitterDistance = 858; this.splitHistoryBrowser.SplitterWidth = 10; this.splitHistoryBrowser.TabIndex = 29; this.splitHistoryBrowser.SplitterMoved += new System.Windows.Forms.SplitterEventHandler(this.splitContainer2_SplitterMoved); // + // totalResults + // + this.totalResults.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.totalResults.Font = new System.Drawing.Font("Microsoft Sans Serif", 10.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.totalResults.Increment = new decimal(new int[] { + 50, + 0, + 0, + 0}); + this.totalResults.Location = new System.Drawing.Point(644, 14); + this.totalResults.Maximum = new decimal(new int[] { + 10000, + 0, + 0, + 0}); + this.totalResults.MaximumSize = new System.Drawing.Size(145, 0); + this.totalResults.Minimum = new decimal(new int[] { + 1, + 0, + 0, + 0}); + this.totalResults.Name = "totalResults"; + this.totalResults.Size = new System.Drawing.Size(125, 40); + this.totalResults.TabIndex = 11; + this.totalResults.Value = new decimal(new int[] { + 50, + 0, + 0, + 0}); + // // imgTip // this.imgTip.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.imgTip.Enabled = false; this.imgTip.Image = global::ADD.Properties.Resources.TipDisabled; - this.imgTip.Location = new System.Drawing.Point(919, 14); + this.imgTip.Location = new System.Drawing.Point(913, 14); this.imgTip.Name = "imgTip"; this.imgTip.Size = new System.Drawing.Size(40, 40); this.imgTip.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom; @@ -1124,7 +1154,7 @@ private void InitializeComponent() this.imgLink.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.imgLink.Enabled = false; this.imgLink.Image = global::ADD.Properties.Resources.LinkDisabled; - this.imgLink.Location = new System.Drawing.Point(965, 14); + this.imgLink.Location = new System.Drawing.Point(959, 14); this.imgLink.Name = "imgLink"; this.imgLink.Size = new System.Drawing.Size(40, 40); this.imgLink.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom; @@ -1136,7 +1166,7 @@ private void InitializeComponent() // this.imgFriend.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.imgFriend.Image = global::ADD.Properties.Resources.FriendDisabled; - this.imgFriend.Location = new System.Drawing.Point(873, 14); + this.imgFriend.Location = new System.Drawing.Point(867, 14); this.imgFriend.Name = "imgFriend"; this.imgFriend.Size = new System.Drawing.Size(40, 40); this.imgFriend.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom; @@ -1149,7 +1179,7 @@ private void InitializeComponent() this.imgTrash.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.imgTrash.Enabled = false; this.imgTrash.Image = global::ADD.Properties.Resources.TrashDisabled; - this.imgTrash.Location = new System.Drawing.Point(1011, 14); + this.imgTrash.Location = new System.Drawing.Point(1005, 14); this.imgTrash.Name = "imgTrash"; this.imgTrash.Size = new System.Drawing.Size(40, 40); this.imgTrash.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom; @@ -1161,7 +1191,7 @@ private void InitializeComponent() // this.imgFavorite.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.imgFavorite.Image = global::ADD.Properties.Resources.star; - this.imgFavorite.Location = new System.Drawing.Point(827, 14); + this.imgFavorite.Location = new System.Drawing.Point(821, 14); this.imgFavorite.Name = "imgFavorite"; this.imgFavorite.Size = new System.Drawing.Size(40, 40); this.imgFavorite.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom; @@ -1179,7 +1209,7 @@ private void InitializeComponent() this.txtTransIDSearch.Location = new System.Drawing.Point(101, 14); this.txtTransIDSearch.Margin = new System.Windows.Forms.Padding(10, 3, 3, 3); this.txtTransIDSearch.Name = "txtTransIDSearch"; - this.txtTransIDSearch.Size = new System.Drawing.Size(543, 40); + this.txtTransIDSearch.Size = new System.Drawing.Size(537, 40); this.txtTransIDSearch.TabIndex = 1; this.txtTransIDSearch.TabStop = false; this.txtTransIDSearch.Text = "ENTER SEARCH STRING"; @@ -1191,7 +1221,7 @@ private void InitializeComponent() // this.imgCatalog.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.imgCatalog.Image = global::ADD.Properties.Resources.home; - this.imgCatalog.Location = new System.Drawing.Point(781, 14); + this.imgCatalog.Location = new System.Drawing.Point(775, 14); this.imgCatalog.Name = "imgCatalog"; this.imgCatalog.Size = new System.Drawing.Size(40, 40); this.imgCatalog.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom; @@ -1232,7 +1262,7 @@ private void InitializeComponent() this.panel1.Controls.Add(this.webBrowser1); this.panel1.Location = new System.Drawing.Point(4, 63); this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(1051, 1084); + this.panel1.Size = new System.Drawing.Size(1045, 1079); this.panel1.TabIndex = 5; // // imgOpenRight @@ -1240,7 +1270,7 @@ private void InitializeComponent() this.imgOpenRight.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.imgOpenRight.BackColor = System.Drawing.Color.Transparent; this.imgOpenRight.Image = global::ADD.Properties.Resources.OpenRight; - this.imgOpenRight.Location = new System.Drawing.Point(-3, 1045); + this.imgOpenRight.Location = new System.Drawing.Point(-3, 1040); this.imgOpenRight.Name = "imgOpenRight"; this.imgOpenRight.Size = new System.Drawing.Size(33, 41); this.imgOpenRight.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; @@ -1254,10 +1284,10 @@ private void InitializeComponent() this.txtInfoBox.BackColor = System.Drawing.Color.White; this.txtInfoBox.BorderStyle = System.Windows.Forms.BorderStyle.None; this.txtInfoBox.Dock = System.Windows.Forms.DockStyle.Bottom; - this.txtInfoBox.Location = new System.Drawing.Point(0, 1060); + this.txtInfoBox.Location = new System.Drawing.Point(0, 1055); this.txtInfoBox.Name = "txtInfoBox"; this.txtInfoBox.ReadOnly = true; - this.txtInfoBox.Size = new System.Drawing.Size(1051, 24); + this.txtInfoBox.Size = new System.Drawing.Size(1045, 24); this.txtInfoBox.TabIndex = 0; this.txtInfoBox.TabStop = false; this.txtInfoBox.Text = "Click Help Then Info for Assistance."; @@ -1268,9 +1298,9 @@ private void InitializeComponent() // this.imgApertusSplash.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom))); this.imgApertusSplash.Image = global::ADD.Properties.Resources.About; - this.imgApertusSplash.Location = new System.Drawing.Point(309, 22); + this.imgApertusSplash.Location = new System.Drawing.Point(306, 22); this.imgApertusSplash.Name = "imgApertusSplash"; - this.imgApertusSplash.Size = new System.Drawing.Size(423, 1019); + this.imgApertusSplash.Size = new System.Drawing.Size(423, 1014); this.imgApertusSplash.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom; this.imgApertusSplash.TabIndex = 0; this.imgApertusSplash.TabStop = false; @@ -1284,7 +1314,7 @@ private void InitializeComponent() this.webBrowser1.MinimumSize = new System.Drawing.Size(20, 20); this.webBrowser1.Name = "webBrowser1"; this.webBrowser1.ScriptErrorsSuppressed = true; - this.webBrowser1.Size = new System.Drawing.Size(1051, 1084); + this.webBrowser1.Size = new System.Drawing.Size(1045, 1079); this.webBrowser1.TabIndex = 1; this.webBrowser1.TabStop = false; this.webBrowser1.Navigated += new System.Windows.Forms.WebBrowserNavigatedEventHandler(this.webBrowser1_Navigated); @@ -1316,36 +1346,6 @@ private void InitializeComponent() this.tmrPauseBeforeRefreshingMonitor.Interval = 2000; this.tmrPauseBeforeRefreshingMonitor.Tick += new System.EventHandler(this.tmrPauseBeforeRefreshingMonitor_Tick); // - // totalResults - // - this.totalResults.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.totalResults.Font = new System.Drawing.Font("Microsoft Sans Serif", 10.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.totalResults.Increment = new decimal(new int[] { - 50, - 0, - 0, - 0}); - this.totalResults.Location = new System.Drawing.Point(650, 14); - this.totalResults.Maximum = new decimal(new int[] { - 10000, - 0, - 0, - 0}); - this.totalResults.MaximumSize = new System.Drawing.Size(145, 0); - this.totalResults.Minimum = new decimal(new int[] { - 1, - 0, - 0, - 0}); - this.totalResults.Name = "totalResults"; - this.totalResults.Size = new System.Drawing.Size(125, 40); - this.totalResults.TabIndex = 11; - this.totalResults.Value = new decimal(new int[] { - 50, - 0, - 0, - 0}); - // // Main // this.AutoScaleDimensions = new System.Drawing.SizeF(12F, 25F); @@ -1402,6 +1402,7 @@ private void InitializeComponent() this.splitHistoryBrowser.Panel2.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.splitHistoryBrowser)).EndInit(); this.splitHistoryBrowser.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.totalResults)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.imgTip)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.imgLink)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.imgFriend)).EndInit(); @@ -1416,7 +1417,6 @@ private void InitializeComponent() ((System.ComponentModel.ISupportInitialize)(this.imgApertusSplash)).EndInit(); this.statusArchiveStatus.ResumeLayout(false); this.statusArchiveStatus.PerformLayout(); - ((System.ComponentModel.ISupportInitialize)(this.totalResults)).EndInit(); this.ResumeLayout(false); this.PerformLayout(); diff --git a/ADD/Main.cs b/ADD/Main.cs index 1338a71..e3d1e4b 100644 --- a/ADD/Main.cs +++ b/ADD/Main.cs @@ -1305,6 +1305,8 @@ private void cmbCoinType_SelectedIndexChanged(object sender, EventArgs e) searchToolStripMenuItem.Enabled = false; CoinType = cmbCoinType.Text; + + if (fileSize > 0 || txtMessage.TextLength > 0) { updateEstimatedCost(); @@ -1398,7 +1400,16 @@ private void cmbCoinType_SelectedIndexChanged(object sender, EventArgs e) cmbWalletLabel.Enabled = true; cmbFolder.Enabled = true; + if (!coinVariablePayloadByteSize[CoinType]) + { btnAddFolder.Enabled = true; + profilesToolStripMenuItem.Enabled = true; + } + else + { + btnAddFolder.Enabled = false; + profilesToolStripMenuItem.Enabled = false; + } btnFriendEncryption.Enabled = true; cmbSignature.Enabled = true; btnAddSignature.Enabled = true; @@ -1406,7 +1417,7 @@ private void cmbCoinType_SelectedIndexChanged(object sender, EventArgs e) cmbFollow.Enabled = true; btnAddVault.Enabled = true; cmbTo.Enabled = true; - profilesToolStripMenuItem.Enabled = true; + @@ -1611,7 +1622,7 @@ private string[] AddressArrayToLedger(string[] AddressArray, string WalletKey) try { - var transaction = b.GetRawTransaction(headerArray[0], 1); + var transaction = b.GetRawDataTransaction(headerArray[0], 1); } catch { @@ -1937,7 +1948,7 @@ public Boolean ConvertAddressArrayToFile(string[] AddressArray, byte[] RawBytes, try { var b = new CoinRPC(new Uri(GetURL(coinIP[WalletKey]) + ":" + coinPort[WalletKey]), new NetworkCredential(coinUser[WalletKey], coinPassword[WalletKey])); - var transaction = b.GetRawTransaction(TransID, 1); + var transaction = b.GetRawDataTransaction(TransID, 1); printDate = "PENDING"; //place in batch queue to be tried again later. if (transaction.blocktime == 0) @@ -2013,9 +2024,9 @@ public Boolean ConvertAddressArrayToFile(string[] AddressArray, byte[] RawBytes, if (transact.category == "receive") { - var details = b.GetRawTransaction(transact.txid, 1); + var details = b.GetRawDataTransaction(transact.txid, 1); - foreach (BitcoinNET.RPCClient.GetRawTransactionResponse.Output detail in details.vout) + foreach (BitcoinNET.RPCClient.GetRawDataTransactionResponse.Output detail in details.vout) { try { inqCount[detail.scriptPubKey.addresses[0]]++; } catch { } } @@ -2258,7 +2269,7 @@ private void ParseData(byte[] ByteData, string TransID, string FileName, bool Tr }; - if (chkFilterUnSafeContent.Checked && !TrustContent && !safeExtensions.Contains(Path.GetExtension(FileName)) && FileName != "PRO" && FileName != "SIG" && FileName != "LNK") + if (chkFilterUnSafeContent.Checked && !TrustContent && !safeExtensions.Contains(Path.GetExtension(FileName)) && FileName != "PRO" && FileName != "SIG" && !FileName.EndsWith(".SIG") && FileName != "LNK") { strPrintLine = "
[ " + FileName + " ]
"; foundType = true; @@ -2343,11 +2354,6 @@ private void ParseData(byte[] ByteData, string TransID, string FileName, bool Tr } - - - - - } @@ -2529,13 +2535,17 @@ private string[] CreateAddressArrayFromTransactionID(string TransactionId, strin var b = new CoinRPC(new Uri(GetURL(coinIP[WalletKey]) + ":" + coinPort[WalletKey]), new NetworkCredential(coinUser[WalletKey], coinPassword[WalletKey])); - if (!coinVariablePayloadByteSize[WalletKey]) - { - try + try { - var transaction = b.GetRawTransaction(TransactionId, 1); + var transaction = b.GetRawDataTransaction(TransactionId, 1); lastTransID = TransactionId; + if (transaction.data != null && transaction.data.Length > 0) + { + addressBuilder = addressBuilder + delimiter + transaction.data; + return addressBuilder.Split(','); + } + if (transaction.vout.Length == 2) { if (coinMinTransaction[WalletKey] == transaction.vout[1].value) { arcValue = coinMinTransaction[WalletKey]; } @@ -2545,7 +2555,7 @@ private string[] CreateAddressArrayFromTransactionID(string TransactionId, strin else { Dictionary arcValues = new Dictionary(); - foreach (BitcoinNET.RPCClient.GetRawTransactionResponse.Output detail in transaction.vout) + foreach (BitcoinNET.RPCClient.GetRawDataTransactionResponse.Output detail in transaction.vout) { if (!arcValues.ContainsKey(detail.value)) @@ -2562,7 +2572,7 @@ private string[] CreateAddressArrayFromTransactionID(string TransactionId, strin } - foreach (BitcoinNET.RPCClient.GetRawTransactionResponse.Output detail in transaction.vout) + foreach (BitcoinNET.RPCClient.GetRawDataTransactionResponse.Output detail in transaction.vout) { if (detail.value == arcValue) @@ -2601,13 +2611,6 @@ private string[] CreateAddressArrayFromTransactionID(string TransactionId, strin { } } - } - else - { - var transaction = b.GetRawDataTransaction(TransactionId, 1); - addressBuilder = addressBuilder + delimiter + transaction.data; - delimiter = ","; - } return addressBuilder.Split(','); diff --git a/ADD/Properties/AssemblyInfo.cs b/ADD/Properties/AssemblyInfo.cs index 515bdb3..9afafbb 100644 --- a/ADD/Properties/AssemblyInfo.cs +++ b/ADD/Properties/AssemblyInfo.cs @@ -10,7 +10,7 @@ [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("HugPuddle.org")] [assembly: AssemblyProduct("Apertus")] -[assembly: AssemblyCopyright("Copyright © 2013-2016")] +[assembly: AssemblyCopyright("Copyright © 2013-2017")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] @@ -32,4 +32,4 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("0.3.12")] +[assembly: AssemblyVersion("0.3.13")] diff --git a/ADD/RPC/BlockchainRPC.Methods.cs b/ADD/RPC/BlockchainRPC.Methods.cs index 6cac7fb..3b16454 100644 --- a/ADD/RPC/BlockchainRPC.Methods.cs +++ b/ADD/RPC/BlockchainRPC.Methods.cs @@ -22,19 +22,6 @@ public IEnumerable GetRawMemPool() (new RPCRequest("getrawmempool")); } - public GetRawTransactionResponse GetRawTransaction(string TxId, int Verbose = 0) - { - return RpcCall - (new RPCRequest("getrawtransaction", new Object[] { TxId, Verbose })); - } - - ////Keep For Future Use - //public decimal GetReceivedByAddress(string BitcoinAddress, int MinConf = 1) - //{ - // return RpcCall - // (new RPCRequest("getreceivedbyaddress", new Object[] { BitcoinAddress, MinConf })); - //} - public GetTransactionResponse GetTransaction(string TxID) { return RpcCall diff --git a/ADD/RPC/Response/GetRawTransactionResponse.cs b/ADD/RPC/Response/GetRawTransactionResponse.cs index 831a45b..15d5024 100644 --- a/ADD/RPC/Response/GetRawTransactionResponse.cs +++ b/ADD/RPC/Response/GetRawTransactionResponse.cs @@ -6,55 +6,7 @@ namespace BitcoinNET.RPCClient { //Courtesy mb300sd Bitcoin.NET - public class GetRawTransactionResponse - { - public class Input - { - public class ScriptSig - { - public string asm; - public string hex; - } - - public string txid; - public int vout; - public ScriptSig scriptSig; - public long sequence; - } - - public class Output - { - public class ScriptPubKey - { - public string asm; - public string hex; - public int reqSigs; - public string type; - public string[] addresses; - } - - public decimal value; - public int n; - public ScriptPubKey scriptPubKey; - - } - - public string hex; - public string txid; - public int version; - public int locktime; - public Input[] vin; - public Output[] vout; - public string blockhash; - public int confirmations; - public long blocktime; - - public static implicit operator GetRawTransactionResponse(String s) - { - return new GetRawTransactionResponse() { hex = s }; - } - } - + public class GetRawDataTransactionResponse { public class Input