Force blockchainTxVersion to version 3

archethic-foundation · Jan 15, 2025 · 4f2abe2 · 4f2abe2
1 parent 7233139
commit 4f2abe2
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 77 deletions.
diff --git a/lib/domain/usecases/new_keychain.usecase.dart b/lib/domain/usecases/new_keychain.usecase.dart
@@ -11,6 +11,8 @@ import 'package:logging/logging.dart';
 
 final _logger = Logger('KeychainUtil');
 
+const blockchainTxVersion = 3;
+
 class CreateNewAppWalletCase with aedappfm.TransactionMixin {
   CreateNewAppWalletCase({
     required this.sessionNotifier,
@@ -46,10 +48,6 @@ class CreateNewAppWalletCase with aedappfm.TransactionMixin {
       servicesMap[kServiceName] = kDerivationPath;
     }
 
-    final blockchainTxVersion = int.parse(
-      (await targetApiService.getBlockchainVersion()).version.transaction,
-    );
-
     final originPrivateKey = targetApiService.getOriginKey();
 
     /// Create Keychain from keyChain seed and wallet public key to encrypt secret

diff --git a/lib/infrastructure/repositories/transaction/archethic_transaction.dart b/lib/infrastructure/repositories/transaction/archethic_transaction.dart
@@ -15,6 +15,8 @@ import 'package:aewallet/model/blockchain/keychain_secured_infos.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({
@@ -71,10 +73,6 @@ class ArchethicTransactionRepository
 
     final index = indexMap[transfer.genesisAddress] ?? 0;
 
-    final blockchainTxVersion = int.parse(
-      (await apiService.getBlockchainVersion()).version.transaction,
-    );
-
     var tokenTransferList = <archethic.TokenTransfer>[];
     var ucoTransferList = <archethic.UCOTransfer>[];
 
@@ -134,10 +132,6 @@ class ArchethicTransactionRepository
 
     final index = indexMap[token.genesisAddress] ?? 0;
 
-    final blockchainTxVersion = int.parse(
-      (await apiService.getBlockchainVersion()).version.transaction,
-    );
-
     return AddTokenTransactionBuilder.build(
       tokenName: token.name,
       tokenSymbol: token.symbol,

diff --git 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<archethic.Transaction> 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/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,10 +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',
         version: blockchainTxVersion,
@@ -423,10 +409,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 +450,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 +476,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 +499,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 +536,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 +563,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 +584,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 +607,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/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';
@@ -24,6 +26,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,
@@ -347,13 +351,16 @@ class AppService {
       '>> START getRecentTransactions : ${DateTime.now()}',
     );
 
+    final _localRecentTransactionList =
+        List<RecentTransaction>.from(localRecentTransactionList);
+
     // get the most recent movement in cache
     var mostRecentTimestamp = 0;
-    if (localRecentTransactionList.isNotEmpty) {
-      localRecentTransactionList.sort(
+    if (_localRecentTransactionList.isNotEmpty) {
+      _localRecentTransactionList.sort(
         (a, b) => b.timestamp!.compareTo(a.timestamp!),
       );
-      mostRecentTimestamp = localRecentTransactionList.first.timestamp ?? 0;
+      mostRecentTimestamp = _localRecentTransactionList.first.timestamp ?? 0;
     }
     var recentTransactions = <RecentTransaction>[];
 
@@ -366,7 +373,7 @@ class AppService {
     var index = lastIndex[genesisAddress] ?? 0;
     String addressToSearch;
     var iterMax = 10;
-    recentTransactions.addAll(localRecentTransactionList);
+    recentTransactions.addAll(_localRecentTransactionList);
 
     while (index > 0 && iterMax > 0) {
       addressToSearch = uint8ListToHex(
@@ -376,7 +383,7 @@ class AppService {
         ),
       );
       _logger.info('addressToSearch : $addressToSearch');
-      if (localRecentTransactionList.any(
+      if (_localRecentTransactionList.any(
         (element) =>
             element.address!.toUpperCase() == addressToSearch.toUpperCase(),
       )) {
@@ -951,9 +958,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/util/keychain_util.dart b/lib/util/keychain_util.dart
@@ -18,6 +18,7 @@ import 'package:archethic_lib_dart/archethic_lib_dart.dart';
 import 'package:event_taxi/event_taxi.dart';
 import 'package:logging/logging.dart';
 
+const blockchainTxVersion = 3;
 mixin KeychainServiceMixin {
   final kMainDerivation = "m/650'/";
 
@@ -48,9 +49,6 @@ mixin KeychainServiceMixin {
   ) async {
     final _logger = Logger('createKeyChainAccess');
 
-    final blockchainTxVersion = int.parse(
-      (await apiService.getBlockchainVersion()).version.transaction,
-    );
     final originPrivateKey = apiService.getOriginKey();
 
     /// Create Keychain Access for wallet