Merge pull request #35 from LiquidCats/feature/add-bech32m-addresses-…

…support
Merkeleon · Nov 6, 2023 · a014b76 · a014b76
2 parents 4f54897 + 25e3538
commit a014b76
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/src/Utils/Bech32Decoder.php b/src/Utils/Bech32Decoder.php
@@ -28,7 +28,12 @@ class Bech32Decoder
         -1, 29, -1, 24, 13, 25,  9,  8, 23, -1, 18, 22, 31, 27, 19, -1,
         1,  0,  3, 16, 11, 28, 12, 14,  6,  4,  2, -1, -1, -1, -1, -1
     ];
-
+    public const BECH32_POLY = 1;
+    public const BECH32M_POLY = 0x2bc830a3;
+    private const ALLOWED_POLY = [
+        self::BECH32_POLY,
+        self::BECH32M_POLY,
+    ];
     /**
      * Validates a bech32 string and returns [$hrp, $dataChars] if
      * the conversion was successful. An exception is thrown on invalid
@@ -139,7 +144,7 @@ private function verifyChecksum(string $hrp, array $convertedDataChars): bool
         $r = array_merge($expandHrp, $convertedDataChars);
         $poly = $this->polyMod($r, count($r));
 
-        return $poly === 1;
+        return in_array($poly, self::ALLOWED_POLY, true);
     }
 
 

diff --git a/tests/ValidatorTest.php b/tests/ValidatorTest.php
@@ -70,6 +70,7 @@ public function currencyAddressProvider(): array
             'Bitcoin #6' => [CurrencyEnum::BITCOIN, 'testnet', false, '1BvBMSEYstWetqTFn5Au4m4GFg7xJaNVN2'],
             'Bitcoin #7' => [CurrencyEnum::BITCOIN, 'testnet', false, 'bc1q6v096h88xmpl662af0nc7wd3vta56zv6pyccl8'],
             'Bitcoin #8' => [CurrencyEnum::BITCOIN, 'mainnet', true, 'BC1QL2725QLXHGWQ7F7XLJ8363FJCUF25XZ35SWRU5'],
+            'Bitcoin #9' => [CurrencyEnum::BITCOIN, 'mainnet', true, 'bc1p5gyty9x2lrk65yndaeh242zm6xklgrv9nze9477dg0kyv6yvfljq0lqjkh'],
             //
             'Cardano #1' => [CurrencyEnum::CARDANO, 'mainnet', true, 'addr1v9ywm0h3r8cnxrs04gfy7c3s2j44utjyvn5ldjdca0c2ltccgqdes'],
             'Cardano #2' => [CurrencyEnum::CARDANO, 'mainnet', false, 'stake1u9f9v0z5zzlldgx58n8tklphu8mf7h4jvp2j2gddluemnssjfnkzz'],