fix(wallet): bug with coldcard wallet config p2sh-p2wsh ordering

unchained-capital · Dec 17, 2020 · f599c03 · f599c03
1 parent 5d97ed3
commit f599c03
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/src/components/Coldcard/ColdcardSigner.jsx b/src/components/Coldcard/ColdcardSigner.jsx
@@ -33,6 +33,13 @@ class ColdcardSigner extends Component {
         ? walletConfig.name
         : `${walletConfig.name}_${startingAddressIndex.toString()}`;
 
+    // At the moment (2020-Dec), Coldcard has just released a new firmware version
+    // which addresses the following problem:  that they inverted the ordering
+    // for p2sh-p2wsh as p2wsh-p2sh but we need to support the older firmware.
+    walletConfig.addressType = walletConfig.addressType.includes("-")
+      ? "P2WSH-P2SH"
+      : walletConfig.addressType;
+
     const interaction = ConfigAdapter({
       KEYSTORE: COLDCARD,
       jsonConfig: walletConfig,