nathanwoodburn/FireWallet
nathanwoodburn/FireWallet
1
0
Fork 0
mirror of https://github.com/Nathanwoodburn/FireWallet.git synced 2024-11-24 08:08:14 +11:00
Code Issues Packages Projects Releases Wiki Activity

package: Increased version

Browse Source
This commit is contained in:
Nathan Woodburn 2023-06-22 13:27:13 +10:00
parent 71a04edc02
commit 843f824b2f
Signed by: nathanwoodburn
GPG Key ID: 203B000478AD0EF1
3 changed files with 11 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
FireWallet/FireWallet.csproj
View File

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

26
FireWallet/MainForm.cs
View File

@ -200,7 +200,7 @@ namespace FireWallet
await Task.Delay(1000); await Task.Delay(1000);
AddLog("Close Failed"); AddLog("Close Failed");
} }
StreamReader sr = new StreamReader(dir + "node.txt"); StreamReader sr = new StreamReader(dir + "node.txt");
NodeSettings = new Dictionary<string, string>(); NodeSettings = new Dictionary<string, string>();
while (!sr.EndOfStream) while (!sr.EndOfStream)
@ -237,7 +237,8 @@ namespace FireWallet
{ {
int timeout = Convert.ToInt32(NodeSettings["Timeout"]); int timeout = Convert.ToInt32(NodeSettings["Timeout"]);
httpClient.Timeout = TimeSpan.FromSeconds(timeout); httpClient.Timeout = TimeSpan.FromSeconds(timeout);
} else httpClient.Timeout = TimeSpan.FromSeconds(10); }
else httpClient.Timeout = TimeSpan.FromSeconds(10);
if (NodeSettings.ContainsKey("HSD")) if (NodeSettings.ContainsKey("HSD"))
{ {
@ -780,8 +781,6 @@ namespace FireWallet
buttonRedeemAll.Visible = true; buttonRedeemAll.Visible = true;
buttonSendAll.Visible = true; buttonSendAll.Visible = true;
} }
if (WatchOnly) if (WatchOnly)
{ {
buttonAddressVerify.Visible = true; buttonAddressVerify.Visible = true;
@ -1185,14 +1184,9 @@ namespace FireWallet
if (hideScreen) if (hideScreen)
{ {
HSDProcess.StartInfo.RedirectStandardError = true; HSDProcess.StartInfo.RedirectStandardError = true;
// Log errors to AddLog
HSDProcess.ErrorDataReceived += (sender, e) => AddLog("HSD Error: " + e.Data); HSDProcess.ErrorDataReceived += (sender, e) => AddLog("HSD Error: " + e.Data);
}
else
{
HSDProcess.StartInfo.RedirectStandardError = false;
} }
else HSDProcess.StartInfo.RedirectStandardError = false;
HSDProcess.StartInfo.RedirectStandardInput = true; HSDProcess.StartInfo.RedirectStandardInput = true;
HSDProcess.StartInfo.RedirectStandardOutput = false; HSDProcess.StartInfo.RedirectStandardOutput = false;
@ -1259,10 +1253,7 @@ namespace FireWallet
await Task.Delay(1000); await Task.Delay(1000);
} }
if (splash) if (splash) ss.CloseSplash();
{
ss.CloseSplash();
}
this.Enabled = true; this.Enabled = true;
this.Visible = true; this.Visible = true;
return true; return true;
@ -1282,10 +1273,7 @@ namespace FireWallet
JObject resp = JObject.Parse(APIresponse); JObject resp = JObject.Parse(APIresponse);
return resp["address"].ToString(); return resp["address"].ToString();
} }
catch catch { return "Error"; }
{
return "Error";
}
} }
private async void GetTXHistory() private async void GetTXHistory()
@ -2627,6 +2615,6 @@ namespace FireWallet
} }
#endregion #endregion
} }
} }

6
FireWalletSetup/FireWalletSetup.vdproj
View File

@ -224,15 +224,15 @@
{ {
"Name" = "8:Microsoft Visual Studio" "Name" = "8:Microsoft Visual Studio"
"ProductName" = "8:FireWallet" "ProductName" = "8:FireWallet"
"ProductCode" = "8:{C118B90C-B5A0-4015-B03A-FB226DC02F54}" "ProductCode" = "8:{E636567F-DDA4-4C6E-89B0-38DC64FD5528}"
"PackageCode" = "8:{FF49B317-BBC1-40D9-9AFF-315E3AEED79C}" "PackageCode" = "8:{AEAF1ABA-01E0-4A71-A8CC-0D6DDA44E907}"
"UpgradeCode" = "8:{0C86F725-6B01-4173-AA05-3F0EDF481362}" "UpgradeCode" = "8:{0C86F725-6B01-4173-AA05-3F0EDF481362}"
"AspNetVersion" = "8:" "AspNetVersion" = "8:"
"RestartWWWService" = "11:FALSE" "RestartWWWService" = "11:FALSE"
"RemovePreviousVersions" = "11:TRUE" "RemovePreviousVersions" = "11:TRUE"
"DetectNewerInstalledVersion" = "11:TRUE" "DetectNewerInstalledVersion" = "11:TRUE"
"InstallAllUsers" = "11:FALSE" "InstallAllUsers" = "11:FALSE"
"ProductVersion" = "8:3.3" "ProductVersion" = "8:3.4"
"Manufacturer" = "8:Nathan.Woodburn/" "Manufacturer" = "8:Nathan.Woodburn/"
"ARPHELPTELEPHONE" = "8:" "ARPHELPTELEPHONE" = "8:"
"ARPHELPLINK" = "8:https://l.woodburn.au/discord" "ARPHELPLINK" = "8:https://l.woodburn.au/discord"