nathanwoodburn/FireWallet
nathanwoodburn/FireWallet
1
0
Fork 0
mirror of https://github.com/Nathanwoodburn/FireWallet.git synced 2024-09-20 07:27:34 +10:00
Code Issues Packages Projects Releases Wiki Activity

multisig: Cleaned up code and added checks to not show >n signers

Browse Source
This commit is contained in:
Nathan Woodburn 2023-06-26 21:44:11 +10:00
parent 6cc6cd4a79
commit fe7fc4cee9
Signed by: nathanwoodburn
GPG Key ID: 203B000478AD0EF1
4 changed files with 11 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
FireWallet/BatchForm.cs
View File

@ -515,7 +515,7 @@ namespace FireWallet
notifyForm2.Dispose(); notifyForm2.Dispose();
this.Close(); this.Close();
} }
else if (!mainForm.WatchOnly) else if (mainForm.multiSig)
{ {
string batchTX = "[" + string.Join(", ", batches.Select(batch => batch.ToString())) + "]"; string batchTX = "[" + string.Join(", ", batches.Select(batch => batch.ToString())) + "]";
string content = "{\"method\": \"createbatch\",\"params\":[ " + batchTX + "]}"; string content = "{\"method\": \"createbatch\",\"params\":[ " + batchTX + "]}";

2
FireWallet/ImportTXForm.Designer.cs generated
View File

@ -106,7 +106,7 @@
Cancelbutton2.TabIndex = 2; Cancelbutton2.TabIndex = 2;
Cancelbutton2.Text = "Cancel"; Cancelbutton2.Text = "Cancel";
Cancelbutton2.UseVisualStyleBackColor = true; Cancelbutton2.UseVisualStyleBackColor = true;
Cancelbutton2.Click += Cancelbutton2_Click; Cancelbutton2.Click += Cancel;
// //
// label1 // label1
// //

30
FireWallet/ImportTXForm.cs
View File

@ -66,7 +66,7 @@ namespace FireWallet
ParseTX(); ParseTX();
} }
private void Cancelbutton2_Click(object sender, EventArgs e) private void Cancel(object sender, EventArgs e)
{ {
this.Close(); this.Close();
} }
@ -137,18 +137,16 @@ namespace FireWallet
} }
} }
// Set sig label sizes // Set sig label sizes
labelSigsReq.Width = (labelSigsTotal.Width / totalSigs) * reqSigs; labelSigsReq.Width = (labelSigsTotal.Width / totalSigs) * reqSigs;
labelSigsSigned.Width = (labelSigsTotal.Width / totalSigs) * sigs; labelSigsSigned.Width = (labelSigsTotal.Width / totalSigs) * sigs;
labelSigInfo.Text = "Signed: " + sigs + "\nReq: " + reqSigs + " of " + totalSigs; labelSigInfo.Text = "Signed: " + sigs + "\nReq: " + reqSigs + " of " + totalSigs;
if (sigs >= totalSigs)
{
buttonSign.Enabled = false;
buttonSign.Text = "Signed";
}
for (int i = 0; i < inputs.Count; i++) for (int i = 0; i < inputs.Count; i++)
{ {
@ -202,18 +200,6 @@ namespace FireWallet
PanelInput.Controls.Add(amount); PanelInput.Controls.Add(amount);
} }
//if (input["path"].ToString() != "")
//{
// Label ownAddress = new Label();
// ownAddress.Text = "Own Address";
// ownAddress.Location = new Point(PanelInput.Width - 100, 5);
// ownAddress.AutoSize = true;
// PanelInput.Controls.Add(ownAddress);
//}
panelIn.Controls.Add(PanelInput); panelIn.Controls.Add(PanelInput);
} }
@ -308,7 +294,9 @@ namespace FireWallet
labelSigInfo.Text = "Signed: " + sigs + "\nReq: " + reqSigs + " of " + totalSigs; labelSigInfo.Text = "Signed: " + sigs + "\nReq: " + reqSigs + " of " + totalSigs;
signedTX = response; signedTX = response;
} else { } else {
NotifyForm notifyForm = new NotifyForm("Ledger signing not supported yet 😢");
notifyForm.ShowDialog();
notifyForm.Dispose();
} }
} }

1
FireWallet/MainForm.cs
View File

@ -2779,7 +2779,6 @@ namespace FireWallet
} }
else else
{ {
AddLog(covenant.ToString());
string hash = covenant["items"][0].ToString(); string hash = covenant["items"][0].ToString();
if (hashes.ContainsKey(hash)) if (hashes.ContainsKey(hash))
{ {