Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Generic fixes #1427

Merged
merged 2 commits into from
May 4, 2024
Merged

Generic fixes #1427

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
481f5ec
fix for private key solana
OmarHatem28 May 3, 2024
219feec
Fix Solana wallet open
OmarHatem28 May 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 10 additions & 5 deletions cw_solana/lib/solana_wallet.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -360,7 +365,7 @@ abstract class SolanaWalletBase

String toJSON() => json.encode({
'mnemonic': _mnemonic,
'private_key': privateKey,
'private_key': _hexPrivateKey,
'balance': balance[currency]!.toJSON(),
});

Expand Down
Loading