android-apps-mirrors/CakeWallet
0
0
Fork 0
mirror of https://github.com/cake-tech/cake_wallet.git synced 2025-06-28 12:29:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "FIX (#2283)" (#2298)

Browse source 
This reverts commit 7b8ddf9685.
This commit is contained in:
Omar Hatem 2025-05-29 16:54:22 +03:00 • committed by GitHub
parent b77c22b0df
commit d332377a2b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
36 changed files with 402 additions and 667 deletions
Download patch file Download diff file Expand all files Collapse all files

32
cw_solana/lib/solana_client.dart
View file

@ -19,7 +19,7 @@ import '.secrets.g.dart' as secrets;
class SolanaWalletClient {
final httpClient = http.Client();
SolanaProvider? _provider;
SolanaRPC? _provider;
bool connect(Node node) {
try {
@ -38,7 +38,7 @@ class SolanaWalletClient {
formattedUrl = '$protocolUsed://${node.uriRaw}';
}
_provider = SolanaProvider(SolanaRPCHTTPService(url: formattedUrl));
_provider = SolanaRPC(SolanaRPCHTTPService(url: formattedUrl));
return true;
} catch (e) {
@ -49,7 +49,7 @@ class SolanaWalletClient {
Future<double> getBalance(String walletAddress) async {
try {
final balance = await _provider!.requestWithContext(
SolanaRequestGetBalance(
SolanaRPCGetBalance(
account: SolAddress(walletAddress),
),
);
@ -68,11 +68,11 @@ class SolanaWalletClient {
String mintAddress, String publicKey) async {
try {
final result = await _provider!.request(
SolanaRequestGetTokenAccountsByOwner(
SolanaRPCGetTokenAccountsByOwner(
account: SolAddress(publicKey),
mint: SolAddress(mintAddress),
commitment: Commitment.confirmed,
encoding: SolanaRequestEncoding.base64,
encoding: SolanaRPCEncoding.base64,
),
);
@ -96,7 +96,7 @@ class SolanaWalletClient {
for (var tokenAccount in tokenAccounts) {
final tokenAmountResult = await _provider!.request(
SolanaRequestGetTokenAccountBalance(account: tokenAccount.pubkey),
SolanaRPCGetTokenAccountBalance(account: tokenAccount.pubkey),
);
final balance = tokenAmountResult.uiAmountString;
@ -112,7 +112,7 @@ class SolanaWalletClient {
Future<double> getFeeForMessage(String message, Commitment commitment) async {
try {
final feeForMessage = await _provider!.request(
SolanaRequestGetFeeForMessage(
SolanaRPCGetFeeForMessage(
encodedMessage: message,
commitment: commitment,
),
@ -342,7 +342,7 @@ class SolanaWalletClient {
List<SolanaTransactionModel> transactions = [];
try {
final signatures = await _provider!.request(
SolanaRequestGetSignaturesForAddress(
SolanaRPCGetSignaturesForAddress(
account: address,
commitment: commitment,
),
@ -357,9 +357,9 @@ class SolanaWalletClient {
final batchResponses = await Future.wait(batch.map((signature) async {
try {
return await _provider!.request(
SolanaRequestGetTransaction(
SolanaRPCGetTransaction(
transactionSignature: signature['signature'],
encoding: SolanaRequestEncoding.jsonParsed,
encoding: SolanaRPCEncoding.jsonParsed,
maxSupportedTransactionVersion: 0,
),
);
@ -482,7 +482,7 @@ class SolanaWalletClient {
void stop() {}
SolanaProvider? get getSolanaProvider => _provider;
SolanaRPC? get getSolanaProvider => _provider;
Future<PendingSolanaTransaction> signSolanaTransaction({
required String tokenTitle,
@ -523,7 +523,7 @@ class SolanaWalletClient {
Future<SolAddress> _getLatestBlockhash(Commitment commitment) async {
final latestBlockhash = await _provider!.request(
const SolanaRequestGetLatestBlockhash(),
const SolanaRPCGetLatestBlockhash(),
);
return latestBlockhash.blockhash;
@ -599,7 +599,7 @@ class SolanaWalletClient {
required double fee,
}) async {
final rent = await _provider!.request(
SolanaRequestGetMinimumBalanceForRentExemption(
SolanaRPCGetMinimumBalanceForRentExemption(
size: SolanaTokenAccountUtils.accountSize,
),
);
@ -732,7 +732,7 @@ class SolanaWalletClient {
SolanaAccountInfo? accountInfo;
try {
accountInfo = await _provider!.request(
SolanaRequestGetAccountInfo(account: associatedTokenAccount.address),
SolanaRPCGetAccountInfo(account: associatedTokenAccount.address),
);
} catch (e) {
accountInfo = null;
@ -890,7 +890,7 @@ class SolanaWalletClient {
}) async {
/// Sign the transaction with the owner's private key.
final ownerSignature = ownerPrivateKey.sign(transaction.serializeMessage());
transaction.addSignature(ownerPrivateKey.publicKey().toAddress(), ownerSignature);
/// Serialize the transaction.
@ -906,7 +906,7 @@ class SolanaWalletClient {
try {
/// Send the transaction to the Solana network.
final signature = await _provider!.request(
SolanaRequestSendTransaction(
SolanaRPCSendTransaction(
encodedTransaction: serializedTransaction,
commitment: commitment,
),

2
cw_solana/lib/solana_wallet.dart
View file

@ -611,7 +611,7 @@ abstract class SolanaWalletBase
);
}
SolanaProvider? get solanaProvider => _client.getSolanaProvider;
SolanaRPC? get solanaProvider => _client.getSolanaProvider;
@override
String get password => _password;

4
cw_solana/pubspec.yaml
View file

@ -23,11 +23,11 @@ dependencies:
on_chain:
git:
url: https://github.com/cake-tech/on_chain.git
ref: cake-update-v4
ref: cake-update-v2
blockchain_utils:
git:
url: https://github.com/cake-tech/blockchain_utils
ref: cake-update-v4
ref: cake-update-v2
dev_dependencies:
flutter_test: