From 2441b4d7c3fe22af5564ec06dcaae890ca2afa6c Mon Sep 17 00:00:00 2001 From: Craig Raw Date: Wed, 10 Apr 2024 07:44:24 +0200 Subject: [PATCH] handle coldcard singlesig file imports containing p2sh-p2wsh --- .../java/com/sparrowwallet/sparrow/io/ColdcardSinglesig.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/sparrowwallet/sparrow/io/ColdcardSinglesig.java b/src/main/java/com/sparrowwallet/sparrow/io/ColdcardSinglesig.java index 8d0fed12..a8ac9f30 100644 --- a/src/main/java/com/sparrowwallet/sparrow/io/ColdcardSinglesig.java +++ b/src/main/java/com/sparrowwallet/sparrow/io/ColdcardSinglesig.java @@ -72,7 +72,7 @@ public class ColdcardSinglesig implements KeystoreFileImport, WalletImport { ColdcardKeystore ck = gson.fromJson(map.get(key), ColdcardKeystore.class); if(ck.name != null) { - ScriptType ckScriptType = ScriptType.valueOf(ck.name.replace("p2wpkh-p2sh", "p2sh_p2wpkh").replace("p2sh-p2wpkh", "p2sh_p2wpkh").toUpperCase(Locale.ROOT)); + ScriptType ckScriptType = ScriptType.valueOf(ck.name.replace("p2wpkh-p2sh", "p2sh_p2wpkh").replace("-", "_").toUpperCase(Locale.ROOT)); if(ckScriptType.equals(scriptType)) { Keystore keystore = new Keystore(); keystore.setLabel(getName());