Merge pull request #11 from zerocurrencycoin/3.1.0

3.1.0
zerocurrencycoin · Mar 11, 2020 · 4731504 · 4731504
2 parents 006d403 + fd48d14
commit 4731504
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 10 deletions.
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-# Zero SimpleWallet - Andromeda:3.0.1
+# Zero SimpleWallet - Pegasus:3.1.0
 
 # Windows Only
 
@@ -8,4 +8,4 @@
 
 # MAKE SURE SIMPLE WALLET(exe file) & BINARIES("zerod.exe" & "zero-cli.exe") ARE IN THE SAME FOLDER, BEFORE LAUNCHING.
 
-# ZERO BINARIES - https://github.com/zerocurrencycoin/Zero/releases/tag/v3.0.1
+# ZERO BINARIES - https://github.com/zerocurrencycoin/Zero/releases/tag/v3.1.0
diff --git a/SimpleWallet/Properties/AssemblyInfo.cs b/SimpleWallet/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // 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("2.0.3.0")]
-[assembly: AssemblyFileVersion("2.0.3.0")]
+[assembly: AssemblyVersion("2.0.4.0")]
+[assembly: AssemblyFileVersion("2.0.4.0")]
diff --git a/SimpleWallet/Start.cs b/SimpleWallet/Start.cs
@@ -1092,7 +1092,8 @@ void addWalletInfo(String data, String dataChainInfo, String dataZeroNode)
                     }
                     if (nHeight > 800000 && nHeight <= 1600000)
                     {
-                        chainValue += (nHeight - 800000) * 10.8 / 2;
+                        chainValue += 4122990 + ((799999 - 412299) * 10.8);
+                        chainValue += (nHeight - 799999) * 10.8 / 2;
                     }
 
                 }
@@ -1225,10 +1226,10 @@ void addWalletInfo(String data, String dataChainInfo, String dataZeroNode)
                     String[] rowLockedPert = { "Locked Percent", String.Format("{0:0.00%}", Convert.ToDouble(Convert.ToUInt32(zeronodedata.total) * 10000) / chainValue) };
                     dtgZeroNode.Invoke(new Action(() => dtgZeroNode.Rows.Add(rowLockedPert)));
 
-                    String[] rowROI = { "Current ROI", String.Format("{0:0.00%}", ((((2.16 * 720) / Convert.ToDouble(Convert.ToUInt32(zeronodedata.total))) / 10000) * 365)) };
+                    String[] rowROI = { "Current ROI", String.Format("{0:0.00%}", ((((1.35 * 720) / Convert.ToDouble(Convert.ToUInt32(zeronodedata.total))) / 10000) * 365)) };
                     dtgZeroNode.Invoke(new Action(() => dtgZeroNode.Rows.Add(rowROI)));
 
-                    String[] rowIncome = { "Est. Daily Income (1 Node)", String.Format("{0:n8}", ((2.16 * 720) / Convert.ToDouble(Convert.ToUInt32(zeronodedata.total)))) };
+                    String[] rowIncome = { "Est. Daily Income (1 Node)", String.Format("{0:n8}", ((1.35 * 720) / Convert.ToDouble(Convert.ToUInt32(zeronodedata.total)))) };
                     dtgZeroNode.Invoke(new Action(() => dtgZeroNode.Rows.Add(rowIncome)));
 
                 }
@@ -1263,10 +1264,10 @@ void addWalletInfo(String data, String dataChainInfo, String dataZeroNode)
                     dtgZeroNode.Invoke(new Action(() => dtgZeroNode.Rows[8].Cells[1].Value = String.Format("{0:0.00%}", Convert.ToDouble(Convert.ToUInt32(zeronodedata.total) * 10000) / chainValue)));
 
                     dtgZeroNode.Invoke(new Action(() => dtgZeroNode.Rows[9].Cells[0].Value = "Current ROI"));
-                    dtgZeroNode.Invoke(new Action(() => dtgZeroNode.Rows[9].Cells[1].Value = String.Format("{0:0.00%}", ((((2.16 * 720) / Convert.ToDouble(Convert.ToUInt32(zeronodedata.total))) / 10000) * 365))));
+                    dtgZeroNode.Invoke(new Action(() => dtgZeroNode.Rows[9].Cells[1].Value = String.Format("{0:0.00%}", ((((1.35 * 720) / Convert.ToDouble(Convert.ToUInt32(zeronodedata.total))) / 10000) * 365))));
 
                     dtgZeroNode.Invoke(new Action(() => dtgZeroNode.Rows[10].Cells[0].Value = "Est. Daily Income (1 Node)"));
-                    dtgZeroNode.Invoke(new Action(() => dtgZeroNode.Rows[10].Cells[1].Value = String.Format("{0:n8}", ((2.16 * 720) / Convert.ToDouble(Convert.ToUInt32(zeronodedata.total))))));
+                    dtgZeroNode.Invoke(new Action(() => dtgZeroNode.Rows[10].Cells[1].Value = String.Format("{0:n8}", ((1.35 * 720) / Convert.ToDouble(Convert.ToUInt32(zeronodedata.total))))));
 
                 }
 

diff --git a/SimpleWallet/types.cs b/SimpleWallet/types.cs
@@ -54,7 +54,7 @@ public delegate void DaemonEventHandler(object sender,
                                                   DaemonEventArgs e);
     public class Types
     {
-        public static String version = "Zero Simple Wallet - Version 2.0.3";
+        public static String version = "Zero Simple Wallet - Version 2.0.4";
 
         public static String startCommandsFile = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) +
                         "\\zero\\simplewallet\\commands.dat";