Compare commits

..

9 Commits
v4.0 ... master

3 changed files with 12 additions and 8 deletions

View File

@ -839,6 +839,11 @@ namespace FireWallet
Account = comboBoxaccount.Text; Account = comboBoxaccount.Text;
Password = textBoxaccountpassword.Text; Password = textBoxaccountpassword.Text;
// Escape the password to allow use in JSON
Password = Password.Replace("\\", "\\\\");
Password = Password.Replace("\"", "\\\"");
bool loggedin = await Login(); bool loggedin = await Login();
if (loggedin) if (loggedin)
{ {
@ -900,7 +905,6 @@ namespace FireWallet
buttonRevealAll.Enabled = false; buttonRevealAll.Enabled = false;
string content = "{\"method\": \"sendreveal\"}"; string content = "{\"method\": \"sendreveal\"}";
string response = await APIPost("", true, content); string response = await APIPost("", true, content);
AddLog(response);
if (response == "Error") if (response == "Error")
{ {
AddLog("Error sending reveal"); AddLog("Error sending reveal");
@ -936,7 +940,6 @@ namespace FireWallet
{ {
buttonRedeemAll.Enabled = false; buttonRedeemAll.Enabled = false;
string content = "{\"method\": \"sendbatch\", \"params\":[[[\"REDEEM\"]]]}"; string content = "{\"method\": \"sendbatch\", \"params\":[[[\"REDEEM\"]]]}";
AddLog(content);
string response = await APIPost("", true, content); string response = await APIPost("", true, content);
if (response == "Error") if (response == "Error")
{ {
@ -975,7 +978,6 @@ namespace FireWallet
{ {
buttonSendAll.Enabled = false; buttonSendAll.Enabled = false;
string content = "{\"method\": \"sendbatch\", \"params\":[[[\"REVEAL\"],[\"REDEEM\"],[\"RENEW\"]]]}"; string content = "{\"method\": \"sendbatch\", \"params\":[[[\"REVEAL\"],[\"REDEEM\"],[\"RENEW\"]]]}";
AddLog(content);
string response = await APIPost("", true, content); string response = await APIPost("", true, content);
if (response == "Error") if (response == "Error")
{ {

View File

@ -29,8 +29,6 @@ namespace FireWallet
{ {
// Get multisig info // Get multisig info
string infoResp = await mainForm.APIGet("wallet/" + mainForm.Account + "/account/default", true); string infoResp = await mainForm.APIGet("wallet/" + mainForm.Account + "/account/default", true);
mainForm.AddLog(infoResp);
if (infoResp == "Error") if (infoResp == "Error")
{ {
NotifyForm notifyForm = new NotifyForm("Error getting multisig info"); NotifyForm notifyForm = new NotifyForm("Error getting multisig info");
@ -127,7 +125,6 @@ namespace FireWallet
string path = "wallet/" + mainForm.Account + "/shared-key"; string path = "wallet/" + mainForm.Account + "/shared-key";
string content = "{\"accountKey\": \"" + sig + "\",\"account\":\"default\"}"; string content = "{\"accountKey\": \"" + sig + "\",\"account\":\"default\"}";
string resp = await APIPut(path, true, content); string resp = await APIPut(path, true, content);
mainForm.AddLog(resp);
UpdateInfo(); UpdateInfo();
} }
@ -136,7 +133,6 @@ namespace FireWallet
string path = "wallet/" + mainForm.Account + "/shared-key"; string path = "wallet/" + mainForm.Account + "/shared-key";
string content = "{\"accountKey\": \"" + sig + "\",\"account\":\"default\"}"; string content = "{\"accountKey\": \"" + sig + "\",\"account\":\"default\"}";
string resp = await APIPut(path, true, content); string resp = await APIPut(path, true, content);
mainForm.AddLog(resp);
UpdateInfo(); UpdateInfo();
} }

View File

@ -1,5 +1,7 @@
# FireWallet # FireWallet
Experimental wallet for Handshake chain Experimental wallet for Handshake chain
The newer python version is available [here](https://github.com/nathanwoodburn/firewalletbrowser)
Info about the project can be found at https://firewallet or https://firewallet.au
## Installation ## Installation
### Dependencies ### Dependencies
@ -175,6 +177,10 @@ There are 4 modes: `off` is disabled, `mica` is windows app style, `key` is to m
This file stores the logs for the application. This file stores the logs for the application.
You should check this file if you have any issues with the application. You should check this file if you have any issues with the application.
# Thanks
Thanks to @ponderingken (https://github.com/ponderingken) for designing the logo and splash screen.
# Support # Support
If you have any issues with the application you can open an issue on GitHub or contact me on Discord (NathanWoodburn on most Handshake servers). If you have any issues with the application you can open an issue on GitHub or contact me on Discord (NathanWoodburn on most Handshake servers).