simplify address extraction

breez · Jul 21, 2023 · f66e2cd · f66e2cd
1 parent 24e5eee
commit f66e2cd
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 28 deletions.
diff --git a/lib/services/breezlib/breez_bridge.dart b/lib/services/breezlib/breez_bridge.dart
@@ -775,18 +775,9 @@ class BreezBridge {
   }
 
   Future<String> validateAddress(String address) {
-    String addr = address;
-    if (address == null) {
-      return Future.error("empty address");
-    }
-    addr = extractBitcoinAddressFromBip21(address) ?? addr;
-
-    if (addr.startsWith("bitcoin:") || addr.startsWith("BITCOIN:")) {
-      addr = addr.substring(8);
-      isLegacyOrNestedSegwit(addr) ? addr : addr.toLowerCase();
-    }
-    return _invokeMethodWhenReady("validateAddress", {"argument": addr})
-        .then((response) => addr);
+    address = extractBitcoinAddress(address);
+    return _invokeMethodWhenReady("validateAddress", {"argument": address})
+        .then((response) => address);
   }
 
   Future<Int64> getDefaultOnChainFeeRate() {

diff --git a/lib/utils/bip21.dart b/lib/utils/bip21.dart
@@ -14,24 +14,23 @@ String extractBolt11FromBip21(String bip21) {
   return null;
 }
 
-String extractBitcoinAddressFromBip21(String bip21) {
-  String urnScheme = "bitcoin";
-  if (bip21.startsWith("bitcoin:") || bip21.startsWith("BITCOIN:")) {
+const String URN_SCHEME = "bitcoin:";
+
+String extractBitcoinAddress(String address) {
+  if (address.toLowerCase().startsWith(URN_SCHEME)) {
     try {
-      int split = bip21.indexOf("?");
-      String address =
-          bip21.substring(urnScheme.length + 1, split == -1 ? null : split);
-      if (address.isNotEmpty) {
-        isLegacyOrNestedSegwit(address)
-            ? address
-            : address = address.toLowerCase();
-        return address;
+      int split = address.indexOf("?");
+      String addr =
+          address.substring(URN_SCHEME.length, split == -1 ? null : split);
+      if (addr.isNotEmpty) {
+        isLegacyOrNestedSegwit(addr) ? addr : addr = addr.toLowerCase();
+        return addr;
       }
     } on FormatException {
       // do nothing.
     }
   }
-  return null;
+  return address;
 }
 
 bool isLegacyOrNestedSegwit(String address) {

diff --git a/test/invoice_test.dart b/test/invoice_test.dart
@@ -1,3 +1,5 @@
+import 'dart:math';
+
 import 'package:breez/utils/bip21.dart';
 import 'package:flutter_test/flutter_test.dart';
 
@@ -35,21 +37,39 @@ void main() {
 
     test("should extract bitcoin addresss from bip21 full info legacy address",
         () async {
-      String bitcoinAddress = extractBitcoinAddressFromBip21(
+      String bitcoinAddress = extractBitcoinAddress(
           "bitcoin:1DamianM2k8WfNEeJmyqSe2YW1upB7UATx?amount=0.000001&lightning=1234");
       expect(bitcoinAddress, "1DamianM2k8WfNEeJmyqSe2YW1upB7UATx");
     });
 
     test("should extract bitcoin address from bip 21 nested segwit", () async {
-      String bitcoinAddress = extractBitcoinAddressFromBip21(
-          "bitcoin:3K2CfYmqYuD99CDyqrdzt481F9jkLKirEn?amount=0.00001&label=sbddesign%3A%20For%20lunch%20Tuesday&message=For%20lunch%20Tuesday&lightning=LNBC10U1P3PJ257PP5YZTKWJCZ5FTL5LAXKAV23ZMZEKAW37ZK6KMV80PK4XAEV5QHTZ7QDPDWD3XGER9WD5KWM36YPRX7U3QD36KUCMGYP282ETNV3SHJCQZPGXQYZ5VQSP5USYC4LK9CHSFP53KVCNVQ456GANH60D89REYKDNGSMTJ6YW3NHVQ9QYYSSQJCEWM5CJWZ4A6RFJX77C490YCED6PEMK0UPKXHY89CMM7SCT66K8GNEANWYKZGDRWRFJE69H9U5U0W57RRCSYSAS7GADWMZXC8C6T0SPJAZUP6");
+      String bitcoinAddress = extractBitcoinAddress(
+          "BITCOIN:3K2CfYmqYuD99CDyqrdzt481F9jkLKirEn?amount=0.00001&label=sbddesign%3A%20For%20lunch%20Tuesday&message=For%20lunch%20Tuesday&lightning=LNBC10U1P3PJ257PP5YZTKWJCZ5FTL5LAXKAV23ZMZEKAW37ZK6KMV80PK4XAEV5QHTZ7QDPDWD3XGER9WD5KWM36YPRX7U3QD36KUCMGYP282ETNV3SHJCQZPGXQYZ5VQSP5USYC4LK9CHSFP53KVCNVQ456GANH60D89REYKDNGSMTJ6YW3NHVQ9QYYSSQJCEWM5CJWZ4A6RFJX77C490YCED6PEMK0UPKXHY89CMM7SCT66K8GNEANWYKZGDRWRFJE69H9U5U0W57RRCSYSAS7GADWMZXC8C6T0SPJAZUP6");
       expect(bitcoinAddress, "3K2CfYmqYuD99CDyqrdzt481F9jkLKirEn");
     });
 
     test("should extract bitcoin address from bip 21 bech32", () async {
-      String bitcoinAddress = extractBitcoinAddressFromBip21(
+      String bitcoinAddress = extractBitcoinAddress(
           "BITCOIN:BC1QYLH3U67J673H6Y6ALV70M0PL2YZ53TZHVXGG7U?amount=0.00001&label=sbddesign%3A%20For%20lunch%20Tuesday&message=For%20lunch%20Tuesday&lightning=LNBC10U1P3PJ257PP5YZTKWJCZ5FTL5LAXKAV23ZMZEKAW37ZK6KMV80PK4XAEV5QHTZ7QDPDWD3XGER9WD5KWM36YPRX7U3QD36KUCMGYP282ETNV3SHJCQZPGXQYZ5VQSP5USYC4LK9CHSFP53KVCNVQ456GANH60D89REYKDNGSMTJ6YW3NHVQ9QYYSSQJCEWM5CJWZ4A6RFJX77C490YCED6PEMK0UPKXHY89CMM7SCT66K8GNEANWYKZGDRWRFJE69H9U5U0W57RRCSYSAS7GADWMZXC8C6T0SPJAZUP6");
       expect(bitcoinAddress, "bc1qylh3u67j673h6y6alv70m0pl2yz53tzhvxgg7u");
     });
+
+    test("should extract the same address as it receives", () {
+      String bitcoinAddress =
+          extractBitcoinAddress("3K2CfYmqYuD99CDyqrdzt481F9jkLKirEn");
+      expect(bitcoinAddress, "3K2CfYmqYuD99CDyqrdzt481F9jkLKirEn");
+    });
+
+    test("should extract the address from bip21 scheme", () async {
+      String bitcoinAddress = extractBitcoinAddress(
+          "BITCOIN:BC1QYLH3U67J673H6Y6ALV70M0PL2YZ53TZHVXGG7U");
+      expect(bitcoinAddress, "bc1qylh3u67j673h6y6alv70m0pl2yz53tzhvxgg7u");
+    });
+
+    test("should extract the same address as it receives", () {
+      String bitcoinAddress =
+          extractBitcoinAddress("BItCOiN:3K2CfYmqYuD99CDyqrdzt481F9jkLKirEn");
+      expect(bitcoinAddress, "3K2CfYmqYuD99CDyqrdzt481F9jkLKirEn");
+    });
   });
 }