From 2808c40ffa068e245c0da864e89ac8ef7798b999 Mon Sep 17 00:00:00 2001 From: CryptoForge Date: Wed, 11 Mar 2020 12:45:18 -0700 Subject: [PATCH 1/2] fix WalletInfo --- SimpleWallet/Start.cs | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/SimpleWallet/Start.cs b/SimpleWallet/Start.cs index 67d4762..f1be459 100644 --- 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)))))); } From fd48d14a661bca45716db420b95aa67b59efd78c Mon Sep 17 00:00:00 2001 From: CryptoForge Date: Wed, 11 Mar 2020 12:45:34 -0700 Subject: [PATCH 2/2] bump version --- README.md | 4 ++-- SimpleWallet/Properties/AssemblyInfo.cs | 4 ++-- SimpleWallet/types.cs | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index d4dd820..95f7285 100644 --- 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 index 223b5d9..c8b568f 100644 --- 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/types.cs b/SimpleWallet/types.cs index 139fda7..0c36102 100644 --- 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";