From c997c1709b8b7b77f8f82b575dc141dc013750cd Mon Sep 17 00:00:00 2001 From: redDwarf03 Date: Wed, 15 Jan 2025 21:51:15 +0100 Subject: [PATCH] chore: --- .../metadata/android/en-US/changelogs/610.txt | 3 + lib/application/aeswap/dex_token.dart | 8 +- lib/application/market_price.dart | 6 +- .../transaction/send_transaction.dart | 46 ++-- .../transaction/archethic_transaction.dart | 22 +- .../transaction_keychain_builder.dart | 8 +- .../sign_transactions/command_handler.dart | 4 +- .../contracts/archethic_contract.dart | 53 +---- .../application/pool/dex_pool_tx_list.dart | 6 +- lib/service/app_service.dart | 9 +- .../util/transaction_raw.dart | 4 +- lib/util/keychain_util.dart | 40 +--- pubspec.lock | 218 +++++++++--------- pubspec.yaml | 24 +- web_chrome_extension/public/manifest.json | 2 +- 15 files changed, 169 insertions(+), 284 deletions(-) create mode 100644 fastlane/metadata/android/en-US/changelogs/610.txt diff --git a/fastlane/metadata/android/en-US/changelogs/610.txt b/fastlane/metadata/android/en-US/changelogs/610.txt new file mode 100644 index 000000000..c1bd4d3fd --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/610.txt @@ -0,0 +1,3 @@ +Version 4.5.0 + +- Fix bugs diff --git a/lib/application/aeswap/dex_token.dart b/lib/application/aeswap/dex_token.dart index e01c44c74..24469eeda 100644 --- a/lib/application/aeswap/dex_token.dart +++ b/lib/application/aeswap/dex_token.dart @@ -83,10 +83,10 @@ Future _estimateTokenInFiat( String tokenAddress, ) async { if (tokenAddress.isUCO) { - return ref.watch( - aedappfm.ArchethicOracleUCOProviders.archethicOracleUCO - .select((value) => value.usd), - ); + return (await ref.watch( + aedappfm.ArchethicOracleUCOProviders.archethicOracleUCO.future, + )) + .usd; } else { final environment = ref.watch(environmentProvider); return await ref.watch( diff --git a/lib/application/market_price.dart b/lib/application/market_price.dart index f38fcb28c..207f1cbab 100644 --- a/lib/application/market_price.dart +++ b/lib/application/market_price.dart @@ -40,8 +40,10 @@ Future _currencyMarketPrice( Future _selectedCurrencyMarketPrice( Ref ref, ) async { - final archethicOracleUCO = - ref.watch(aedappfm.ArchethicOracleUCOProviders.archethicOracleUCO); + final archethicOracleUCO = await ref.watch( + aedappfm.ArchethicOracleUCOProviders.archethicOracleUCO.future, + ); + return MarketPrice( amount: archethicOracleUCO.usd, lastLoading: archethicOracleUCO.timestamp, diff --git a/lib/domain/usecases/transaction/send_transaction.dart b/lib/domain/usecases/transaction/send_transaction.dart index 961930ad0..d327911fe 100644 --- a/lib/domain/usecases/transaction/send_transaction.dart +++ b/lib/domain/usecases/transaction/send_transaction.dart @@ -112,7 +112,6 @@ class SendTransactionUseCase final AppWallet wallet; final ApiService apiService; final NetworksSetting networkSettings; - @override Future> run( SendTransactionCommand command, { @@ -120,21 +119,6 @@ class SendTransactionUseCase }) async { final _logger = Logger('SendTransactionUseCase'); - final operationCompleter = - Completer>(); - - void _fail(TransactionError error) { - operationCompleter.complete( - Result.failure(error), - ); - } - - final transactionSender = ArchethicTransactionSender( - phoenixHttpEndpoint: networkSettings.getPhoenixHttpLink(), - websocketEndpoint: networkSettings.getWebsocketUri(), - apiService: apiService, - ); - final transaction = await command.toArchethicTransaction( wallet: wallet, apiService: apiService, @@ -147,8 +131,9 @@ class SendTransactionUseCase } try { - // ignore: cascade_invocations - await transactionSender.send( + final confirmation = await ArchethicTransactionSender( + apiService: apiService, + ).send( transaction: transaction, onConfirmation: (confirmation) async { onProgress?.call( @@ -157,25 +142,22 @@ class SendTransactionUseCase progress: confirmation.nbConfirmations, ), ); - if (confirmation.isFullyConfirmed) { - _logger.info('Final confirmation received : $confirmation'); - operationCompleter.complete( - Result.success(confirmation), - ); - return; - } _logger.info('Confirmation received : $confirmation'); }, - onError: (error) async { - _logger.severe('Transaction error received', error); - _fail(error); - }, ); + if (confirmation == null) { + return const Result.failure(TransactionError.userRejected()); + } + + _logger.info('Final confirmation received : $confirmation'); + return Result.success(confirmation); + } on TransactionError catch (error) { + _logger.severe('Transaction error received', error); + return Result.failure(error); } catch (e) { - _fail(const TransactionError.other()); + _logger.severe('Transaction error received', e); + return const Result.failure(TransactionError.other()); } - - return operationCompleter.future; } } diff --git a/lib/infrastructure/repositories/transaction/archethic_transaction.dart b/lib/infrastructure/repositories/transaction/archethic_transaction.dart index a398746e4..c8748d21c 100644 --- a/lib/infrastructure/repositories/transaction/archethic_transaction.dart +++ b/lib/infrastructure/repositories/transaction/archethic_transaction.dart @@ -18,6 +18,8 @@ import 'package:aewallet/service/app_service.dart'; import 'package:aewallet/util/keychain_util.dart'; import 'package:archethic_lib_dart/archethic_lib_dart.dart' as archethic; +const blockchainTxVersion = 3; + class ArchethicTransactionRepository implements TransactionRemoteRepositoryInterface { ArchethicTransactionRepository({ @@ -115,10 +117,6 @@ class ArchethicTransactionRepository final index = indexMap[transfer.transactionLastAddress] ?? 0; - final blockchainTxVersion = int.parse( - (await apiService.getBlockchainVersion()).version.transaction, - ); - var tokenTransferList = []; var ucoTransferList = []; @@ -178,10 +176,6 @@ class ArchethicTransactionRepository final index = indexMap[token.transactionLastAddress] ?? 0; - final blockchainTxVersion = int.parse( - (await apiService.getBlockchainVersion()).version.transaction, - ); - return AddTokenTransactionBuilder.build( tokenName: token.name, tokenSymbol: token.symbol, @@ -278,8 +272,6 @@ class ArchethicTransactionRepository required TransactionErrorHandler onError, }) async { final transactionSender = archethic.ArchethicTransactionSender( - phoenixHttpEndpoint: phoenixHttpEndpoint, - websocketEndpoint: websocketEndpoint, apiService: apiService, ); @@ -290,10 +282,6 @@ class ArchethicTransactionRepository transactionSender, transactionConfirmation, ), - onError: (error) => onError( - transactionSender, - error, - ), ); } @@ -305,8 +293,6 @@ class ArchethicTransactionRepository required TransactionErrorHandler onError, }) async { final transactionSender = archethic.ArchethicTransactionSender( - phoenixHttpEndpoint: phoenixHttpEndpoint, - websocketEndpoint: websocketEndpoint, apiService: apiService, ); @@ -317,10 +303,6 @@ class ArchethicTransactionRepository transactionSender, transactionConfirmation, ), - onError: (error) => onError( - transactionSender, - error, - ), ); } } diff --git a/lib/infrastructure/repositories/transaction/transaction_keychain_builder.dart b/lib/infrastructure/repositories/transaction/transaction_keychain_builder.dart index 5e640f4ff..806be85c1 100644 --- a/lib/infrastructure/repositories/transaction/transaction_keychain_builder.dart +++ b/lib/infrastructure/repositories/transaction/transaction_keychain_builder.dart @@ -1,9 +1,13 @@ /// SPDX-License-Identifier: AGPL-3.0-or-later +// ignore_for_file: avoid_redundant_argument_values + import 'dart:convert'; import 'dart:math'; import 'package:archethic_lib_dart/archethic_lib_dart.dart' as archethic; import 'package:flutter/foundation.dart'; +const blockchainTxVersion = 3; + extension KeychainTransactionBuilder on archethic.Transaction { /// Builds a creation of keychain Transaction static Future build({ @@ -26,10 +30,6 @@ extension KeychainTransactionBuilder on archethic.Transaction { ), ); - final blockchainTxVersion = int.parse( - (await apiService.getBlockchainVersion()).version.transaction, - ); - final keychainTransaction = archethic.Transaction( type: 'keychain', version: blockchainTxVersion, diff --git a/lib/infrastructure/rpc/sign_transactions/command_handler.dart b/lib/infrastructure/rpc/sign_transactions/command_handler.dart index 1b1862169..53208580c 100644 --- a/lib/infrastructure/rpc/sign_transactions/command_handler.dart +++ b/lib/infrastructure/rpc/sign_transactions/command_handler.dart @@ -7,7 +7,6 @@ import 'package:archethic_wallet_client/archethic_wallet_client.dart' as awc; class RPCSignTransactionsCommandHandler extends RPCCommandHandler< awc.SignTransactionRequest, awc.SignTransactionsResult> { RPCSignTransactionsCommandHandler() : super(); - @override RPCCommand commandToModel( awc.Request dto, @@ -16,7 +15,7 @@ class RPCSignTransactionsCommandHandler extends RPCCommandHandler< []; final transactions = dto.payload['transactions']; for (final Map transaction in transactions) { - final tx = archethic.Transaction.fromJson(transaction); + final tx = archethic.Transaction.fromNodeRPC(transaction); final rpcSignTransactionCommandData = awc.SignTransactionRequestData( data: tx.data!, version: tx.version, @@ -24,7 +23,6 @@ class RPCSignTransactionsCommandHandler extends RPCCommandHandler< ); rpcSignTransactionCommandDataList.add(rpcSignTransactionCommandData); } - return RPCCommand( origin: dto.origin.toModel, data: awc.SignTransactionRequest( diff --git a/lib/modules/aeswap/application/contracts/archethic_contract.dart b/lib/modules/aeswap/application/contracts/archethic_contract.dart index 76f856184..52c6b2ac1 100644 --- a/lib/modules/aeswap/application/contracts/archethic_contract.dart +++ b/lib/modules/aeswap/application/contracts/archethic_contract.dart @@ -1,4 +1,6 @@ /// SPDX-License-Identifier: AGPL-3.0-or-later +// ignore_for_file: avoid_redundant_argument_values + import 'dart:async'; import 'dart:math'; import 'dart:typed_data'; @@ -13,6 +15,8 @@ import 'package:archethic_dapp_framework_flutter/archethic_dapp_framework_flutte import 'package:archethic_lib_dart/archethic_lib_dart.dart' as archethic; import 'package:decimal/decimal.dart'; +const blockchainTxVersion = 3; + class ArchethicContract with aedappfm.TransactionMixin { const ArchethicContract({ required this.apiService, @@ -99,9 +103,6 @@ class ArchethicContract with aedappfm.TransactionMixin { publicKey: storageNoncePublicKey, ); - final blockchainTxVersion = int.parse( - (await apiService.getBlockchainVersion()).version.transaction, - ); final originPrivateKey = apiService.getOriginKey(); final transactionPool = archethic.Transaction( @@ -135,9 +136,6 @@ class ArchethicContract with aedappfm.TransactionMixin { transactionPool, apiService, ); - final blockchainTxVersion = int.parse( - (await apiService.getBlockchainVersion()).version.transaction, - ); final transactionTransfer = archethic.Transaction( type: 'transfer', @@ -192,10 +190,6 @@ class ArchethicContract with aedappfm.TransactionMixin { final token2minAmount = Decimal.parse('$token2AmountSorted') * slippagePourcent.toDecimal(); - final blockchainTxVersion = int.parse( - (await apiService.getBlockchainVersion()).version.transaction, - ); - final transactionAdd = archethic.Transaction( type: 'transfer', version: blockchainTxVersion, @@ -308,10 +302,6 @@ class ArchethicContract with aedappfm.TransactionMixin { final token2minAmount = Decimal.parse('$token2AmountSorted') * slippagePourcent.toDecimal(); - final blockchainTxVersion = int.parse( - (await apiService.getBlockchainVersion()).version.transaction, - ); - final transactionLiquidity = archethic.Transaction( type: 'transfer', version: blockchainTxVersion, @@ -363,9 +353,6 @@ class ArchethicContract with aedappfm.TransactionMixin { return aedappfm.Result.guard(() async { const burnAddress = '00000000000000000000000000000000000000000000000000000000000000000000'; - final blockchainTxVersion = int.parse( - (await apiService.getBlockchainVersion()).version.transaction, - ); final transactionLiquidity = archethic.Transaction( type: 'transfer', @@ -423,10 +410,6 @@ class ArchethicContract with aedappfm.TransactionMixin { double outputAmount, ) async { return aedappfm.Result.guard(() async { - final blockchainTxVersion = int.parse( - (await apiService.getBlockchainVersion()).version.transaction, - ); - final minToReceive = (Decimal.parse(outputAmount.toString()) * (Decimal.parse('100') - Decimal.parse(slippage.toString())) / Decimal.parse('100')) @@ -468,10 +451,6 @@ class ArchethicContract with aedappfm.TransactionMixin { double amount, ) async { return aedappfm.Result.guard(() async { - final blockchainTxVersion = int.parse( - (await apiService.getBlockchainVersion()).version.transaction, - ); - final transaction = archethic.Transaction( type: 'transfer', version: blockchainTxVersion, @@ -498,10 +477,6 @@ class ArchethicContract with aedappfm.TransactionMixin { double amount, ) async { return aedappfm.Result.guard(() async { - final blockchainTxVersion = int.parse( - (await apiService.getBlockchainVersion()).version.transaction, - ); - final transaction = archethic.Transaction( type: 'transfer', version: blockchainTxVersion, @@ -525,10 +500,6 @@ class ArchethicContract with aedappfm.TransactionMixin { String level, ) async { return aedappfm.Result.guard(() async { - final blockchainTxVersion = int.parse( - (await apiService.getBlockchainVersion()).version.transaction, - ); - final transaction = archethic.Transaction( type: 'transfer', version: blockchainTxVersion, @@ -566,10 +537,6 @@ class ArchethicContract with aedappfm.TransactionMixin { String level, ) async { return aedappfm.Result.guard(() async { - final blockchainTxVersion = int.parse( - (await apiService.getBlockchainVersion()).version.transaction, - ); - final transaction = archethic.Transaction( type: 'transfer', version: blockchainTxVersion, @@ -597,10 +564,6 @@ class ArchethicContract with aedappfm.TransactionMixin { String farmGenesisAddress, ) async { return aedappfm.Result.guard(() async { - final blockchainTxVersion = int.parse( - (await apiService.getBlockchainVersion()).version.transaction, - ); - final transaction = archethic.Transaction( type: 'transfer', version: blockchainTxVersion, @@ -622,10 +585,6 @@ class ArchethicContract with aedappfm.TransactionMixin { String depositId, ) async { return aedappfm.Result.guard(() async { - final blockchainTxVersion = int.parse( - (await apiService.getBlockchainVersion()).version.transaction, - ); - final transaction = archethic.Transaction( type: 'transfer', version: blockchainTxVersion, @@ -649,10 +608,6 @@ class ArchethicContract with aedappfm.TransactionMixin { String depositId, ) async { return aedappfm.Result.guard(() async { - final blockchainTxVersion = int.parse( - (await apiService.getBlockchainVersion()).version.transaction, - ); - final transaction = archethic.Transaction( type: 'transfer', version: blockchainTxVersion, diff --git a/lib/modules/aeswap/application/pool/dex_pool_tx_list.dart b/lib/modules/aeswap/application/pool/dex_pool_tx_list.dart index 72322411a..d1dca41ca 100644 --- a/lib/modules/aeswap/application/pool/dex_pool_tx_list.dart +++ b/lib/modules/aeswap/application/pool/dex_pool_tx_list.dart @@ -58,8 +58,8 @@ Future> _getPoolTxList( if (transactionAction != null && transactionAction.data != null && - transactionAction.data!.actionRecipients.isNotEmpty && - transactionAction.data!.actionRecipients[0].action != null) { + transactionAction.data!.recipients.isNotEmpty && + transactionAction.data!.recipients[0].action != null) { var token1Amount = 0.0; var token2Amount = 0.0; double? totalValue; @@ -68,7 +68,7 @@ Future> _getPoolTxList( DexToken? token1; DexToken? token2; DexActionType? typeTx; - switch (transactionAction.data!.actionRecipients[0].action) { + switch (transactionAction.data!.recipients[0].action) { case 'swap': for (final transactionMovement in transactionAction .validationStamp!.ledgerOperations!.transactionMovements) { diff --git a/lib/service/app_service.dart b/lib/service/app_service.dart index c36f20267..ded47727e 100644 --- a/lib/service/app_service.dart +++ b/lib/service/app_service.dart @@ -1,5 +1,7 @@ /// SPDX-License-Identifier: AGPL-3.0-or-later +// ignore_for_file: avoid_redundant_argument_values + import 'dart:async'; import 'dart:convert'; import 'dart:math'; @@ -26,6 +28,8 @@ import 'package:flutter/material.dart'; import 'package:intl/intl.dart'; import 'package:logging/logging.dart'; +const blockchainTxVersion = 3; + class AppService { AppService({ required this.apiService, @@ -251,7 +255,7 @@ class AppService { nbTrf++; } if (nbTrf == 0) { - for (final contractRecipient in transaction.data!.actionRecipients) { + for (final contractRecipient in transaction.data!.recipients) { final recentTransaction = RecentTransaction() ..address = transaction.address!.address ..typeTx = RecentTransaction.transferOutput @@ -1048,9 +1052,6 @@ class AppService { ) async { final lastTransactionMap = await apiService.getLastTransaction([address], request: 'chainLength'); - final blockchainTxVersion = int.parse( - (await apiService.getBlockchainVersion()).version.transaction, - ); final transaction = Transaction( type: 'transfer', diff --git a/lib/ui/views/rpc_command_receiver/util/transaction_raw.dart b/lib/ui/views/rpc_command_receiver/util/transaction_raw.dart index 99d6122d2..4db9252c0 100644 --- a/lib/ui/views/rpc_command_receiver/util/transaction_raw.dart +++ b/lib/ui/views/rpc_command_receiver/util/transaction_raw.dart @@ -262,7 +262,7 @@ class TransactionRawState extends ConsumerState { .toList(), ), ), - if (transactionData.actionRecipients.isNotEmpty) + if (transactionData.recipients.isNotEmpty) ListTile( title: SelectableText( localizations.transactionRawSmartContractCalls, @@ -270,7 +270,7 @@ class TransactionRawState extends ConsumerState { ), subtitle: Column( crossAxisAlignment: CrossAxisAlignment.start, - children: transactionData.actionRecipients + children: transactionData.recipients .map( (actionRecipient) => Padding( padding: const EdgeInsets.only(left: 16), diff --git a/lib/util/keychain_util.dart b/lib/util/keychain_util.dart index b8940c7d5..129cbdd3a 100644 --- a/lib/util/keychain_util.dart +++ b/lib/util/keychain_util.dart @@ -22,6 +22,8 @@ import 'package:archethic_lib_dart/archethic_lib_dart.dart'; import 'package:event_taxi/event_taxi.dart'; import 'package:logging/logging.dart'; +const blockchainTxVersion = 3; + class KeychainUtil with KeychainServiceMixin { final appWalletDatasource = AppWalletHiveDatasource.instance(); @@ -35,10 +37,6 @@ class KeychainUtil with KeychainServiceMixin { Keychain keychain, ApiService apiService, ) async { - final blockchainTxVersion = int.parse( - (await apiService.getBlockchainVersion()).version.transaction, - ); - /// Create Keychain Access for wallet final accessKeychainTx = apiService.newAccessKeychainTransaction( seed!, @@ -49,8 +47,6 @@ class KeychainUtil with KeychainServiceMixin { final TransactionSenderInterface transactionSender = ArchethicTransactionSender( - phoenixHttpEndpoint: networkSettings.getPhoenixHttpLink(), - websocketEndpoint: networkSettings.getWebsocketUri(), apiService: apiService, ); @@ -75,13 +71,6 @@ class KeychainUtil with KeychainServiceMixin { ); } }, - onError: (error) async { - onError( - error, - transactionSender, - TransactionSendEventType.keychainAccess, - ); - }, ); } @@ -111,24 +100,17 @@ class KeychainUtil with KeychainServiceMixin { final keychain = Keychain(seed: hexToUint8List(keychainSeed)) .copyWithService(kServiceName, kDerivationPath); - final blockchainTxVersion = int.parse( - (await apiService.getBlockchainVersion()).version.transaction, - ); - /// Create Keychain from keyChain seed and wallet public key to encrypt secret final keychainTransaction = apiService.newKeychainTransaction( keychainSeed, [uint8ListToHex(walletKeyPair.publicKey!)], hexToUint8List(originPrivateKey), blockchainTxVersion, - serviceName: kServiceName, - derivationPath: kDerivationPath, + servicesMap: {kServiceName: kDerivationPath}, ); final TransactionSenderInterface transactionSender = ArchethicTransactionSender( - phoenixHttpEndpoint: networkSettings.getPhoenixHttpLink(), - websocketEndpoint: networkSettings.getWebsocketUri(), apiService: apiService, ); @@ -155,13 +137,6 @@ class KeychainUtil with KeychainServiceMixin { ); } }, - onError: (error) async { - onError( - error, - transactionSender, - TransactionSendEventType.keychain, - ); - }, ); } @@ -182,8 +157,6 @@ class KeychainUtil with KeychainServiceMixin { final TransactionSenderInterface transactionSender = ArchethicTransactionSender( - phoenixHttpEndpoint: networkSettings.getPhoenixHttpLink(), - websocketEndpoint: networkSettings.getWebsocketUri(), apiService: apiService, ); @@ -208,13 +181,6 @@ class KeychainUtil with KeychainServiceMixin { ); } }, - onError: (error) async { - onError( - error, - transactionSender, - TransactionSendEventType.keychain, - ); - }, ); } diff --git a/pubspec.lock b/pubspec.lock index d4b2adeec..7929c79c1 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -65,30 +65,27 @@ packages: archethic_dapp_framework_flutter: dependency: "direct main" description: - path: "." - ref: upgrade_web_socket - resolved-ref: "85b213ea35218561314596204aa5ea9f3f1b520b" - url: "https://github.com/archethic-foundation/archethic-dapp-framework-flutter.git" - source: git - version: "3.2.2" + name: archethic_dapp_framework_flutter + sha256: "4cc937ef0c23ad010b01e09641f809cc76095a13c007925253bfcdf82db4b404" + url: "https://pub.dev" + source: hosted + version: "3.2.8" archethic_lib_dart: dependency: transitive description: - path: "." - ref: upgrade_graqhql - resolved-ref: "16787df19d2d1de77c9b1a3f02cb7b7cd982dd18" - url: "https://github.com/archethic-foundation/libdart.git" - source: git - version: "4.0.0" + name: archethic_lib_dart + sha256: "31e5b122df87c337d1ce189acc0f41db37a77b65a6638593ec856be90c8bfe2d" + url: "https://pub.dev" + source: hosted + version: "7.2.0" archethic_wallet_client: dependency: "direct main" description: - path: "." - ref: upgrade_web_dependency - resolved-ref: f057a849b350e498b100c289f7f1c52e14c66752 - url: "https://github.com/archethic-foundation/archethic-wallet-client-dart.git" - source: git - version: "2.1.5" + name: archethic_wallet_client + sha256: "4dccce3738a96e33346cbd6f9316186aa7ea7f5399077b21174dba3160e7051c" + url: "https://pub.dev" + source: hosted + version: "2.1.10" archive: dependency: transitive description: @@ -229,10 +226,10 @@ packages: dependency: transitive description: name: built_value - sha256: c7913a9737ee4007efedaffc968c049fd0f3d0e49109e778edc10de9426005cb + sha256: "28a712df2576b63c6c005c465989a348604960c0958d28be5303ba9baa841ac2" url: "https://pub.dev" source: hosted - version: "8.9.2" + version: "8.9.3" cached_network_image: dependency: "direct main" description: @@ -445,10 +442,10 @@ packages: dependency: transitive description: name: device_info_plus_platform_interface - sha256: "282d3cf731045a2feb66abfe61bbc40870ae50a3ed10a4d3d217556c35c8c2ba" + sha256: "0b04e02b30791224b31969eb1b50d723498f402971bff3630bca2ba839bd1ed2" url: "https://pub.dev" source: hosted - version: "7.0.1" + version: "7.0.2" ecdsa: dependency: transitive description: @@ -461,10 +458,10 @@ packages: dependency: "direct main" description: name: elegant_notification - sha256: "9f1bb972c37f313aabf03f41b0d444c4f959dd126d175b71cf1e98c76df96007" + sha256: "4439f045ba21c931316bc1dce731f59d59e0ec4167971639e040ad7e5d96ba9f" url: "https://pub.dev" source: hosted - version: "2.4.0" + version: "2.4.1" elliptic: dependency: transitive description: @@ -634,18 +631,18 @@ packages: dependency: "direct main" description: name: flutter_inappwebview - sha256: "4289afd4fe1eda87f9d370a027b69de12033a796580c45857287ed76123e589f" + sha256: a8f5c9dd300a8cc7fde7bb902ae57febe95e9269424e4d08d5a1a56214e1e6ff url: "https://pub.dev" source: hosted - version: "6.2.0-beta.1" + version: "6.2.0-beta.2" flutter_inappwebview_android: dependency: transitive description: name: flutter_inappwebview_android - sha256: "14662920d8edd620aac0196bf52094d1197ed7a2ac30b6036fb002da0facfc1a" + sha256: "2427e89d9c7b00cc756f800932d7ab8f3272d3fbc71544e1aedb3dbc17dae074" url: "https://pub.dev" source: hosted - version: "1.2.0-beta.1" + version: "1.2.0-beta.2" flutter_inappwebview_internal_annotations: dependency: transitive description: @@ -658,42 +655,42 @@ packages: dependency: transitive description: name: flutter_inappwebview_ios - sha256: f242a910701e9b9fa2c9ffc543417536f5461ee168fb8f2255b5ed9a3eaa05f5 + sha256: "7ff65d7408e453f9a4ff38f74673aeec8cae824cba8276b4b77350262bfe356a" url: "https://pub.dev" source: hosted - version: "1.2.0-beta.1" + version: "1.2.0-beta.2" flutter_inappwebview_macos: dependency: transitive description: name: flutter_inappwebview_macos - sha256: da15186360896df817423a760072c6ccd818a28574451924a43b0e6acc7097c1 + sha256: be8b8ab0100c94ec9fc079a4d48b2bc8dd1a8b4c2647da34f1d3dae93cd5f88a url: "https://pub.dev" source: hosted - version: "1.2.0-beta.1" + version: "1.2.0-beta.2" flutter_inappwebview_platform_interface: dependency: transitive description: name: flutter_inappwebview_platform_interface - sha256: a83de41eabef0853e567aff32891bf43fb42ab7af7f065ee551d7384e192fe93 + sha256: "2c99bf767900ba029d825bc6f494d30169ee83cdaa038d86e85fe70571d0a655" url: "https://pub.dev" source: hosted - version: "1.4.0-beta.1" + version: "1.4.0-beta.2" flutter_inappwebview_web: dependency: transitive description: name: flutter_inappwebview_web - sha256: bc62e5718aec1c59677b5d76a3a62098a8da2668701d033e1d68f13db43f7922 + sha256: "6c4bb61ea9d52e51d79ea23da27c928d0430873c04ad380df39c1ef442b11f4e" url: "https://pub.dev" source: hosted - version: "1.2.0-beta.1" + version: "1.2.0-beta.2" flutter_inappwebview_windows: dependency: transitive description: name: flutter_inappwebview_windows - sha256: "6550a2507daad1003e78a2ba554b96dc2339e2307ac03a6cc2c254b5d1aebbf6" + sha256: "0ff241f814b7caff63b9632cf858b6d3d9c35758040620a9745e5f6e9dd94d74" url: "https://pub.dev" source: hosted - version: "0.7.0-beta.1" + version: "0.7.0-beta.2" flutter_jailbreak_detection: dependency: "direct main" description: @@ -751,18 +748,18 @@ packages: dependency: "direct main" description: name: flutter_native_splash - sha256: "1152ab0067ca5a2ebeb862fe0a762057202cceb22b7e62692dcbabf6483891bb" + sha256: "7062602e0dbd29141fb8eb19220b5871ca650be5197ab9c1f193a28b17537bc7" url: "https://pub.dev" source: hosted - version: "2.4.3" + version: "2.4.4" flutter_plugin_android_lifecycle: dependency: transitive description: name: flutter_plugin_android_lifecycle - sha256: "9b78450b89f059e96c9ebb355fa6b3df1d6b330436e0b885fb49594c41721398" + sha256: "615a505aef59b151b46bbeef55b36ce2b6ed299d160c51d84281946f0aa0ce0e" url: "https://pub.dev" source: hosted - version: "2.0.23" + version: "2.0.24" flutter_riverpod: dependency: "direct main" description: @@ -775,26 +772,26 @@ packages: dependency: "direct main" description: name: flutter_secure_storage - sha256: "165164745e6afb5c0e3e3fcc72a012fb9e58496fb26ffb92cf22e16a821e85d0" + sha256: "9cad52d75ebc511adfae3d447d5d13da15a55a92c9410e50f67335b6d21d16ea" url: "https://pub.dev" source: hosted - version: "9.2.2" + version: "9.2.4" flutter_secure_storage_linux: dependency: transitive description: name: flutter_secure_storage_linux - sha256: "4d91bfc23047422cbcd73ac684bc169859ee766482517c22172c86596bf1464b" + sha256: bf7404619d7ab5c0a1151d7c4e802edad8f33535abfbeff2f9e1fe1274e2d705 url: "https://pub.dev" source: hosted - version: "1.2.1" + version: "1.2.2" flutter_secure_storage_macos: dependency: transitive description: name: flutter_secure_storage_macos - sha256: "1693ab11121a5f925bbea0be725abfcfbbcf36c1e29e571f84a0c0f436147a81" + sha256: "6c0a2795a2d1de26ae202a0d78527d163f4acbb11cde4c75c670f3a0fc064247" url: "https://pub.dev" source: hosted - version: "3.1.2" + version: "3.1.3" flutter_secure_storage_platform_interface: dependency: transitive description: @@ -839,10 +836,10 @@ packages: dependency: "direct main" description: name: flutter_svg - sha256: "936d9c1c010d3e234d1672574636f3352b4941ca3decaddd3cafaeb9ad49c471" + sha256: c200fd79c918a40c5cd50ea0877fa13f81bdaf6f0a5d3dbcc2a13e3285d6aa1b url: "https://pub.dev" source: hosted - version: "2.0.15" + version: "2.0.17" flutter_test: dependency: "direct dev" description: flutter @@ -968,12 +965,11 @@ packages: graphql: dependency: transitive description: - path: "packages/graphql" - ref: hagen00-upgrade-packages - resolved-ref: "29b994bd61b704514a34a6c22f85510d73f46337" - url: "https://github.com/hagen00/graphql-flutter.git" - source: git - version: "5.2.0-beta.9" + name: graphql + sha256: c715080993c8481087ce77b7929224222551823769fb150f5816f9bbbee9e589 + url: "https://pub.dev" + source: hosted + version: "5.2.0-beta.10" graphs: dependency: transitive description: @@ -1034,10 +1030,10 @@ packages: dependency: transitive description: name: http_multi_server - sha256: "97486f20f9c2f7be8f514851703d0119c3596d14ea63227af6f7a481ef2b2f8b" + sha256: aa6199f908078bb1c5efb8d8638d4ae191aac11b311132c3ef48ce352fb52ef8 url: "https://pub.dev" source: hosted - version: "3.2.1" + version: "3.2.2" http_parser: dependency: transitive description: @@ -1074,10 +1070,10 @@ packages: dependency: transitive description: name: image_picker_android - sha256: "8faba09ba361d4b246dc0a17cb4289b3324c2b9f6db7b3d457ee69106a86bd32" + sha256: b62d34a506e12bb965e824b6db4fbf709ee4589cf5d3e99b45ab2287b008ee0c url: "https://pub.dev" source: hosted - version: "0.8.12+17" + version: "0.8.12+20" image_picker_for_web: dependency: transitive description: @@ -1090,10 +1086,10 @@ packages: dependency: transitive description: name: image_picker_ios - sha256: "4f0568120c6fcc0aaa04511cb9f9f4d29fc3d0139884b1d06be88dcec7641d6b" + sha256: "05da758e67bc7839e886b3959848aa6b44ff123ab4b28f67891008afe8ef9100" url: "https://pub.dev" source: hosted - version: "0.8.12+1" + version: "0.8.12+2" image_picker_linux: dependency: transitive description: @@ -1114,10 +1110,10 @@ packages: dependency: transitive description: name: image_picker_platform_interface - sha256: "9ec26d410ff46f483c5519c29c02ef0e02e13a543f882b152d4bfd2f06802f80" + sha256: "886d57f0be73c4b140004e78b9f28a8914a09e50c2d816bdd0520051a71236a0" url: "https://pub.dev" source: hosted - version: "2.10.0" + version: "2.10.1" image_picker_windows: dependency: transitive description: @@ -1146,10 +1142,10 @@ packages: dependency: transitive description: name: io - sha256: "2ec25704aba361659e10e3e5f5d672068d332fc8ac516421d483a11e5cbd061e" + sha256: dfd5a80599cf0165756e3181807ed3e77daf6dd4137caaad72d0b7931597650b url: "https://pub.dev" source: hosted - version: "1.0.4" + version: "1.0.5" js: dependency: "direct main" description: @@ -1266,10 +1262,10 @@ packages: dependency: transitive description: name: local_auth_darwin - sha256: "6d2950da311d26d492a89aeb247c72b4653ddc93601ea36a84924a396806d49c" + sha256: "5c5127061107278ab4cafa1ac51b3b6760282bf1a2abf011270908a429d1634b" url: "https://pub.dev" source: hosted - version: "1.4.1" + version: "1.4.2" local_auth_platform_interface: dependency: transitive description: @@ -1322,10 +1318,10 @@ packages: dependency: "direct main" description: name: material_symbols_icons - sha256: "1dea2aef1c83434f832f14341a5ffa1254e76b68e4d90333f95f8a2643bf1024" + sha256: "89aac72d25dd49303f71b3b1e70f8374791846729365b25bebc2a2531e5b86cd" url: "https://pub.dev" source: hosted - version: "4.2799.0" + version: "4.2801.1" meta: dependency: transitive description: @@ -1442,26 +1438,26 @@ packages: dependency: transitive description: name: package_config - sha256: "1c5b77ccc91e4823a5af61ee74e6b972db1ef98c2ff5a18d3161c982a55448bd" + sha256: "92d4488434b520a62570293fbd33bb556c7d49230791c1b4bbd973baf6d2dc67" url: "https://pub.dev" source: hosted - version: "2.1.0" + version: "2.1.1" package_info_plus: dependency: "direct main" description: name: package_info_plus - sha256: da8d9ac8c4b1df253d1a328b7bf01ae77ef132833479ab40763334db13b91cce + sha256: "739e0a5c3c4055152520fa321d0645ee98e932718b4c8efeeb51451968fe0790" url: "https://pub.dev" source: hosted - version: "8.1.1" + version: "8.1.3" package_info_plus_platform_interface: dependency: transitive description: name: package_info_plus_platform_interface - sha256: ac1f4a4847f1ade8e6a87d1f39f5d7c67490738642e2542f559ec38c37489a66 + sha256: a5ef9986efc7bf772f2696183a3992615baa76c1ffb1189318dd8803778fb05b url: "https://pub.dev" source: hosted - version: "3.0.1" + version: "3.0.2" password_strength: dependency: "direct main" description: @@ -1498,18 +1494,18 @@ packages: dependency: transitive description: name: path_provider_android - sha256: "8c4967f8b7cb46dc914e178daa29813d83ae502e0529d7b0478330616a691ef7" + sha256: "4adf4fd5423ec60a29506c76581bc05854c55e3a0b72d35bb28d661c9686edf2" url: "https://pub.dev" source: hosted - version: "2.2.14" + version: "2.2.15" path_provider_foundation: dependency: transitive description: name: path_provider_foundation - sha256: f234384a3fdd67f989b4d54a5d73ca2a6c422fa55ae694381ae0f4375cd1ea16 + sha256: "4843174df4d288f5e29185bd6e72a6fbdf5a4a4602717eed565497429f179942" url: "https://pub.dev" source: hosted - version: "2.4.0" + version: "2.4.1" path_provider_linux: dependency: transitive description: @@ -1626,18 +1622,18 @@ packages: dependency: transitive description: name: pub_semver - sha256: "40d3ab1bbd474c4c2328c91e3a7df8c6dd629b79ece4c4bd04bee496a224fb0c" + sha256: "7b3cfbf654f3edd0c6298ecd5be782ce997ddf0e00531b9464b55245185bbbbd" url: "https://pub.dev" source: hosted - version: "2.1.4" + version: "2.1.5" pubspec_parse: dependency: transitive description: name: pubspec_parse - sha256: c799b721d79eb6ee6fa56f00c04b472dcd44a30d258fac2174a6ec57302678f8 + sha256: "81876843eb50dc2e1e5b151792c9a985c5ed2536914115ed04e9c8528f6647b0" url: "https://pub.dev" source: hosted - version: "1.3.0" + version: "1.4.0" qr: dependency: transitive description: @@ -1815,10 +1811,10 @@ packages: dependency: transitive description: name: source_helper - sha256: "6adebc0006c37dd63fe05bca0a929b99f06402fc95aa35bf36d67f5c06de01fd" + sha256: "86d247119aedce8e63f4751bd9626fc9613255935558447569ad42f9f5b48b3c" url: "https://pub.dev" source: hosted - version: "1.3.4" + version: "1.3.5" source_span: dependency: transitive description: @@ -1863,10 +1859,10 @@ packages: dependency: transitive description: name: sqflite_darwin - sha256: "96a698e2bc82bd770a4d6aab00b42396a7c63d9e33513a56945cbccb594c2474" + sha256: "22adfd9a2c7d634041e96d6241e6e1c8138ca6817018afc5d443fef91dcefa9c" url: "https://pub.dev" source: hosted - version: "2.4.1" + version: "2.4.1+1" sqflite_platform_interface: dependency: transitive description: @@ -1911,10 +1907,10 @@ packages: dependency: transitive description: name: stream_transform - sha256: "14a00e794c7c11aa145a170587321aedce29769c08d7f58b1d141da75e3b1c6f" + sha256: ad47125e588cfd37a9a7f86c7d6356dde8dfe89d071d293f80ca9e9273a33871 url: "https://pub.dev" source: hosted - version: "2.1.0" + version: "2.1.1" string_scanner: dependency: transitive description: @@ -1959,10 +1955,10 @@ packages: dependency: transitive description: name: timing - sha256: "70a3b636575d4163c477e6de42f247a23b315ae20e86442bebe32d3cabf61c32" + sha256: "62ee18aca144e4a9f29d212f5a4c6a053be252b895ab14b5821996cff4ed90fe" url: "https://pub.dev" source: hosted - version: "1.0.1" + version: "1.0.2" tuple: dependency: "direct main" description: @@ -2031,10 +2027,10 @@ packages: dependency: transitive description: name: url_launcher_ios - sha256: e43b677296fadce447e987a2f519dcf5f6d1e527dc35d01ffab4fff5b8a7063e + sha256: "16a513b6c12bb419304e72ea0ae2ab4fed569920d1c7cb850263fe3acc824626" url: "https://pub.dev" source: hosted - version: "6.3.1" + version: "6.3.2" url_launcher_linux: dependency: transitive description: @@ -2047,10 +2043,10 @@ packages: dependency: transitive description: name: url_launcher_macos - sha256: "769549c999acdb42b8bcfa7c43d72bf79a382ca7441ab18a808e101149daf672" + sha256: "17ba2000b847f334f16626a574c702b196723af2a289e7a93ffcb79acff855c2" url: "https://pub.dev" source: hosted - version: "3.2.1" + version: "3.2.2" url_launcher_platform_interface: dependency: transitive description: @@ -2071,10 +2067,10 @@ packages: dependency: transitive description: name: url_launcher_windows - sha256: "44cf3aabcedde30f2dba119a9dea3b0f2672fbe6fa96e85536251d678216b3c4" + sha256: "3284b6d2ac454cf34f114e1d3319866fdd1e19cdc329999057e44ffe936cfa77" url: "https://pub.dev" source: hosted - version: "3.1.3" + version: "3.1.4" uuid: dependency: "direct main" description: @@ -2103,10 +2099,10 @@ packages: dependency: transitive description: name: vector_graphics_codec - sha256: "2430b973a4ca3c4dbc9999b62b8c719a160100dcbae5c819bae0cacce32c9cdb" + sha256: "99fd9fbd34d9f9a32efd7b6a6aae14125d8237b10403b422a6a6dfeac2806146" url: "https://pub.dev" source: hosted - version: "1.1.12" + version: "1.1.13" vector_graphics_compiler: dependency: transitive description: @@ -2135,10 +2131,10 @@ packages: dependency: transitive description: name: watcher - sha256: "3d2ad6751b3c16cf07c7fca317a1413b3f26530319181b37e3b9039b84fc01d8" + sha256: "69da27e49efa56a15f8afe8f4438c4ec02eff0a117df1b22ea4aad194fe1c104" url: "https://pub.dev" source: hosted - version: "1.1.0" + version: "1.1.1" wave: dependency: transitive description: @@ -2183,10 +2179,10 @@ packages: dependency: transitive description: name: webview_flutter_android - sha256: "285cedfd9441267f6cca8843458620b5fda1af75b04f5818d0441acda5d7df19" + sha256: d1ee28f44894cbabb1d94cc42f9980297f689ff844d067ec50ff88d86e27d63f url: "https://pub.dev" source: hosted - version: "4.1.0" + version: "4.3.0" webview_flutter_platform_interface: dependency: transitive description: @@ -2199,18 +2195,18 @@ packages: dependency: transitive description: name: webview_flutter_wkwebview - sha256: b7e92f129482460951d96ef9a46b49db34bd2e1621685de26e9eaafd9674e7eb + sha256: "4adc14ea9a770cc9e2c8f1ac734536bd40e82615bd0fa6b94be10982de656cc7" url: "https://pub.dev" source: hosted - version: "3.16.3" + version: "3.17.0" win32: dependency: transitive description: name: win32 - sha256: "84ba388638ed7a8cb3445a320c8273136ab2631cd5f2c57888335504ddab1bc2" + sha256: "154360849a56b7b67331c21f09a386562d88903f90a1099c5987afc1912e1f29" url: "https://pub.dev" source: hosted - version: "5.8.0" + version: "5.10.0" win32_registry: dependency: transitive description: @@ -2255,10 +2251,10 @@ packages: dependency: transitive description: name: yaml - sha256: "75769501ea3489fca56601ff33454fe45507ea3bfb014161abc3b43ae25989d5" + sha256: b9da305ac7c39faa3f030eccd175340f968459dae4af175130b3fc47e40d76ce url: "https://pub.dev" source: hosted - version: "3.1.2" + version: "3.1.3" yubidart: dependency: "direct main" description: @@ -2268,5 +2264,5 @@ packages: source: hosted version: "2.0.0" sdks: - dart: ">=3.5.0 <4.0.0" + dart: ">=3.5.3 <4.0.0" flutter: ">=3.24.3" diff --git a/pubspec.yaml b/pubspec.yaml index ad6cf69a0..f3941e6d0 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -3,7 +3,7 @@ description: Fully decentralized and cryptocurrency non-custodial hot wallet tha publish_to: "none" # Remove this line if you wish to publish to pub.dev -version: 4.0.1+601 +version: 4.5.0+610 environment: sdk: ">=3.5.0 <4.0.0" @@ -16,20 +16,20 @@ dependencies: # Retrieve version and url for local app update against store app Android and iOS app_version_update: ^5.0.2 - # archethic_dapp_framework_flutter: ^3.2.1 - archethic_dapp_framework_flutter: - git: - url: https://github.com/archethic-foundation/archethic-dapp-framework-flutter.git - ref: upgrade_web_socket + archethic_dapp_framework_flutter: ^3.2.8 + #archethic_dapp_framework_flutter: + # git: + # url: https://github.com/archethic-foundation/archethic-dapp-framework-flutter.git + # ref: upgrade_web_socket # archethic_dapp_framework_flutter: # path: ../../packages/archethic-dapp-framework-flutter # RPC datastructures. - # archethic_wallet_client: ^2.1.5 - archethic_wallet_client: - git: - url: https://github.com/archethic-foundation/archethic-wallet-client-dart.git - ref: upgrade_web_dependency + archethic_wallet_client: ^2.1.10 + #archethic_wallet_client: + # git: + # url: https://github.com/archethic-foundation/archethic-wallet-client-dart.git + # ref: upgrade_web_dependency # archethic_wallet_client: # path: ../../packages/archethic-wallet-client-dart @@ -300,7 +300,7 @@ msix_config: publisher_display_name: Archethic Technologies SARL identity_name: ArchethicTechnologiesSARL.ArchethicWallet publisher: CN=9687A561-7463-4BA7-BD4D-A04574BAF854 - msix_version: 4.01.601.0 + msix_version: 4.50.610.0 icons_background_color: "#000000" languages: en-us store: true diff --git a/web_chrome_extension/public/manifest.json b/web_chrome_extension/public/manifest.json index 76aaf684f..5f76f6fbd 100644 --- a/web_chrome_extension/public/manifest.json +++ b/web_chrome_extension/public/manifest.json @@ -7,7 +7,7 @@ "48": "icons/icon_48.png", "128": "icons/icon_128.png" }, - "version": "4.0.1.601", + "version": "4.5.0.610", "content_security_policy": { "extension_pages": "script-src 'self' ; object-src 'self'" },