From 6804f713b2f7aa70e4e05a329f4c8cf54abab4fa Mon Sep 17 00:00:00 2001 From: Craig Raw Date: Wed, 8 Dec 2021 10:56:33 +0200 Subject: [PATCH] update hummingbird to v1.6.4 (revised crypto-account format) --- build.gradle | 3 ++- .../java/com/sparrowwallet/sparrow/control/QRScanDialog.java | 4 +++- src/main/java/module-info.java | 1 + 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 7afbb43b..9aa7b9aa 100644 --- a/build.gradle +++ b/build.gradle @@ -65,7 +65,8 @@ dependencies { implementation('com.github.arteam:simple-json-rpc-server:1.0') { exclude group: 'org.slf4j' } - implementation('com.sparrowwallet:hummingbird:1.6.3') + implementation('com.sparrowwallet:hummingbird:1.6.4') + implementation('co.nstant.in:cbor:0.9') implementation('com.nativelibs4java:bridj:0.7-20140918-3') { exclude group: 'com.google.android.tools', module: 'dx' } diff --git a/src/main/java/com/sparrowwallet/sparrow/control/QRScanDialog.java b/src/main/java/com/sparrowwallet/sparrow/control/QRScanDialog.java index 4a7b49f8..aa7c0348 100644 --- a/src/main/java/com/sparrowwallet/sparrow/control/QRScanDialog.java +++ b/src/main/java/com/sparrowwallet/sparrow/control/QRScanDialog.java @@ -499,7 +499,9 @@ public class QRScanDialog extends Dialog { private ScriptType getScriptType(List scriptExpressions) { List expressions = new ArrayList<>(scriptExpressions); - if(expressions.get(expressions.size() - 1) == ScriptExpression.MULTISIG || expressions.get(expressions.size() - 1) == ScriptExpression.SORTED_MULTISIG) { + if(expressions.get(expressions.size() - 1) == ScriptExpression.MULTISIG + || expressions.get(expressions.size() - 1) == ScriptExpression.SORTED_MULTISIG + || expressions.get(expressions.size() - 1) == ScriptExpression.COSIGNER) { expressions.remove(expressions.size() - 1); } diff --git a/src/main/java/module-info.java b/src/main/java/module-info.java index 51975869..cb233e22 100644 --- a/src/main/java/module-info.java +++ b/src/main/java/module-info.java @@ -43,4 +43,5 @@ open module com.sparrowwallet.sparrow { requires io.reactivex.rxjava2fx; requires org.apache.commons.lang3; requires net.sourceforge.streamsupport; + requires co.nstant.in.cbor; } \ No newline at end of file