From 043d7d7c8bcfa2e85ea9ad6b0c6bfef9bca40a00 Mon Sep 17 00:00:00 2001
From: Omar Hatem <omarh.ismail1@gmail.com>
Date: Sat, 4 May 2024 15:35:26 +0300
Subject: [PATCH] Generic fixes (#1427)

* fix for private key solana

* Fix Solana wallet open
---
 cw_solana/lib/solana_wallet.dart | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/cw_solana/lib/solana_wallet.dart b/cw_solana/lib/solana_wallet.dart
index f3eef465c..6692b65a6 100644
--- a/cw_solana/lib/solana_wallet.dart
+++ b/cw_solana/lib/solana_wallet.dart
@@ -145,12 +145,17 @@ abstract class SolanaWalletBase
   Future<Wallet> getWalletPair({String? mnemonic, String? privateKey}) async {
     assert(mnemonic != null || privateKey != null);
 
-    if (privateKey != null) {
-      final privateKeyBytes = base58decode(privateKey);
-      return await Wallet.fromPrivateKeyBytes(privateKey: privateKeyBytes.take(32).toList());
+    if (mnemonic != null) {
+      return Wallet.fromMnemonic(mnemonic, account: 0, change: 0);
     }
 
-    return Wallet.fromMnemonic(mnemonic!, account: 0, change: 0);
+    try {
+      final privateKeyBytes = base58decode(privateKey!);
+      return await Wallet.fromPrivateKeyBytes(privateKey: privateKeyBytes.take(32).toList());
+    } catch (_) {
+      final privateKeyBytes = HEX.decode(privateKey!);
+      return await Wallet.fromPrivateKeyBytes(privateKey: privateKeyBytes);
+    }
   }
 
   @override
@@ -360,7 +365,7 @@ abstract class SolanaWalletBase
 
   String toJSON() => json.encode({
         'mnemonic': _mnemonic,
-        'private_key': privateKey,
+        'private_key': _hexPrivateKey,
         'balance': balance[currency]!.toJSON(),
       });