Use sodium compat as sodium extension throws error on curve check

lostlink · Apr 28, 2022 · 3cb4b01 · 3cb4b01
1 parent ab97975
commit 3cb4b01
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/composer.json b/composer.json
@@ -32,6 +32,7 @@
         "guzzlehttp/guzzle": "^7.3",
         "illuminate/http": "~8.0 || ~9.0",
         "illuminate/support": "^8.0 || ~9.0",
+        "paragonie/sodium_compat": "^1.17",
         "stephenhill/base58": "^1.1"
     },
     "require-dev": {

diff --git a/src/PublicKey.php b/src/PublicKey.php
@@ -2,6 +2,7 @@
 
 namespace Tighten\SolanaPhpSdk;
 
+use ParagonIE_Sodium_Compat;
 use SodiumException;
 use StephenHill\Base58;
 use Tighten\SolanaPhpSdk\Exceptions\BaseSolanaPhpSdkException;
@@ -191,7 +192,12 @@ static function isOnCurve($publicKey): bool
                 ? $publicKey->toBinaryString()
                 : $publicKey;
 
-            $_ = sodium_crypto_sign_ed25519_pk_to_curve25519($binaryString);
+            /**
+             * Sodium extension method sometimes returns "conversion failed" exception.
+             * $_ = sodium_crypto_sign_ed25519_pk_to_curve25519($binaryString);
+             */
+            $_ = ParagonIE_Sodium_Compat::crypto_sign_ed25519_pk_to_curve25519($binaryString);
+
             return true;
         } catch (SodiumException $exception) {
             return false;