From f5a72105ac0f45ba0f934d354c2e943656f5a0ab Mon Sep 17 00:00:00 2001 From: Craig Raw Date: Mon, 12 Jul 2021 08:56:37 +0200 Subject: [PATCH] minor fixes after refactoring --- drongo | 2 +- .../com/sparrowwallet/sparrow/control/MessageSignDialog.java | 2 +- .../sparrowwallet/sparrow/transaction/HeadersController.java | 3 --- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/drongo b/drongo index e53574ea..f1ce2ec9 160000 --- a/drongo +++ b/drongo @@ -1 +1 @@ -Subproject commit e53574ea542aa8311dba61e18658482611d74632 +Subproject commit f1ce2ec939743e24dcd1d8426f3b68e8971c2be0 diff --git a/src/main/java/com/sparrowwallet/sparrow/control/MessageSignDialog.java b/src/main/java/com/sparrowwallet/sparrow/control/MessageSignDialog.java index 7310dc46..7fdedd02 100644 --- a/src/main/java/com/sparrowwallet/sparrow/control/MessageSignDialog.java +++ b/src/main/java/com/sparrowwallet/sparrow/control/MessageSignDialog.java @@ -316,7 +316,7 @@ public class MessageSignDialog extends Dialog { Keystore keystore = decryptedWallet.getKeystores().get(0); ECKey privKey = keystore.getKey(walletNode); 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.appendText(signatureText); privKey.clear(); diff --git a/src/main/java/com/sparrowwallet/sparrow/transaction/HeadersController.java b/src/main/java/com/sparrowwallet/sparrow/transaction/HeadersController.java index 4b840fc8..da245470 100644 --- a/src/main/java/com/sparrowwallet/sparrow/transaction/HeadersController.java +++ b/src/main/java/com/sparrowwallet/sparrow/transaction/HeadersController.java @@ -442,9 +442,6 @@ public class HeadersController extends TransactionFormController implements Init String type = "Legacy"; if(headersForm.getTransaction().isSegwit() || (headersForm.getPsbt() != null && headersForm.getPsbt().getPsbtInputs().stream().anyMatch(in -> in.getWitnessUtxo() != null))) { type = "Segwit"; - if(headersForm.getTransaction().getSegwitFlag() == 2) { - type = "Taproot"; - } } segwit.setText(type); }