minor fixes after refactoring

This commit is contained in:
Craig Raw 2021-07-12 08:56:37 +02:00
parent 0502eec0cd
commit f5a72105ac
3 changed files with 2 additions and 5 deletions

2
drongo

@ -1 +1 @@
Subproject commit e53574ea542aa8311dba61e18658482611d74632 Subproject commit f1ce2ec939743e24dcd1d8426f3b68e8971c2be0

View file

@ -316,7 +316,7 @@ public class MessageSignDialog extends Dialog<ButtonBar.ButtonData> {
Keystore keystore = decryptedWallet.getKeystores().get(0); Keystore keystore = decryptedWallet.getKeystores().get(0);
ECKey privKey = keystore.getKey(walletNode); ECKey privKey = keystore.getKey(walletNode);
ScriptType scriptType = electrumSignatureFormat ? ScriptType.P2PKH : decryptedWallet.getScriptType(); ScriptType scriptType = electrumSignatureFormat ? ScriptType.P2PKH : decryptedWallet.getScriptType();
String signatureText = privKey.signMessage(message.getText().trim(), scriptType, null); String signatureText = privKey.signMessage(message.getText().trim(), scriptType);
signature.clear(); signature.clear();
signature.appendText(signatureText); signature.appendText(signatureText);
privKey.clear(); privKey.clear();

View file

@ -442,9 +442,6 @@ public class HeadersController extends TransactionFormController implements Init
String type = "Legacy"; String type = "Legacy";
if(headersForm.getTransaction().isSegwit() || (headersForm.getPsbt() != null && headersForm.getPsbt().getPsbtInputs().stream().anyMatch(in -> in.getWitnessUtxo() != null))) { if(headersForm.getTransaction().isSegwit() || (headersForm.getPsbt() != null && headersForm.getPsbt().getPsbtInputs().stream().anyMatch(in -> in.getWitnessUtxo() != null))) {
type = "Segwit"; type = "Segwit";
if(headersForm.getTransaction().getSegwitFlag() == 2) {
type = "Taproot";
}
} }
segwit.setText(type); segwit.setText(type);
} }