refactor: update nekoton_repository@0.51.0-dev.4 (#792)

Co-authored-by: Egor Komarov <e.komarov.bf@gmail.com>
broxus · Feb 27, 2025 · 5033a66 · 5033a66
1 parent b2e38c3
commit 5033a66
Show file tree

Hide file tree

Showing 11 changed files with 62 additions and 85 deletions.
diff --git a/lib/app/service/assets_service.dart b/lib/app/service/assets_service.dart
@@ -1,7 +1,6 @@
 import 'dart:async';
 import 'dart:convert';
 
-import 'package:app/app/service/connection/connection_factory.dart';
 import 'package:app/app/service/presets_connection/presets_connection_service.dart';
 import 'package:app/app/service/service.dart';
 import 'package:app/data/models/models.dart';
@@ -24,7 +23,6 @@ class AssetsService {
     this.presetsConnectionService,
     this.httpService,
     this.storage,
-    this.connectionFactory,
     this.tonRepository,
   );
 
@@ -36,7 +34,6 @@ class AssetsService {
   final PresetsConnectionService presetsConnectionService;
   final HttpService httpService;
   final GeneralStorageService storage;
-  final ConnectionFactory connectionFactory;
   final TonRepository tonRepository;
 
   StreamSubscription<TransportStrategy>? _currentTransportSubscription;
@@ -232,7 +229,6 @@ class AssetsService {
       if (transport.networkType == 'ton') {
         final details = await JettonWallet.getJettonRootDetails(
           transport: transport.transport,
-          gqlConnection: connectionFactory.getTonGqlConnection(),
           tokenRoot: rootTokenContract,
         );
         final info = await tonRepository.getTokenInfo(

diff --git a/lib/app/service/connection/connection.dart b/lib/app/service/connection/connection.dart
@@ -1,4 +1,3 @@
-export 'connection_factory.dart';
 export 'connection_service.dart';
 export 'data/data.dart';
 export 'default_network.dart';

diff --git a/lib/app/service/connection/connection_factory.dart b/lib/app/service/connection/connection_factory.dart
diff --git a/lib/app/service/connection/generic_token_subscriber.dart b/lib/app/service/connection/generic_token_subscriber.dart
@@ -1,4 +1,3 @@
-import 'package:app/app/service/connection/connection_factory.dart';
 import 'package:app/http/repository/ton_repository.dart';
 import 'package:nekoton_repository/nekoton_repository.dart';
 
@@ -27,11 +26,9 @@ class Tip3TokenWalletSubscriber extends GenericTokenSubscriber {
 class JettonTokenWalletSubscriber extends GenericTokenSubscriber {
   JettonTokenWalletSubscriber(
     this._tonRepository,
-    this._connectionFactory,
   );
 
   final TonRepository _tonRepository;
-  final ConnectionFactory _connectionFactory;
   final Map<Address, Symbol> _symbolCache = {};
 
   @override
@@ -42,7 +39,6 @@ class JettonTokenWalletSubscriber extends GenericTokenSubscriber {
   }) async =>
       JettonTokenWallet.subscribe(
         transport: transport,
-        gqlConnection: _connectionFactory.getTonGqlConnection(),
         owner: owner,
         rootTokenContract: rootTokenContract,
         symbol: await _getSymbol(rootTokenContract),

diff --git a/lib/app/service/connection/transport_strategies/common_transport_strategy.dart b/lib/app/service/connection/transport_strategies/common_transport_strategy.dart
@@ -127,7 +127,7 @@ class CommonTransportStrategy extends AppTransportStrategy {
 
   late final _subscriber = switch (genericTokenType) {
     GenericTokenType.tip3 => Tip3TokenWalletSubscriber(),
-    GenericTokenType.jetton => JettonTokenWalletSubscriber(inject(), inject()),
+    GenericTokenType.jetton => JettonTokenWalletSubscriber(inject()),
   };
 
   NetworkGroup get networkGroup => transport.group;

diff --git a/lib/di/di.config.dart b/lib/di/di.config.dart
diff --git a/lib/feature/browser/approvals_listener/actions/send_message/send_message_model.dart b/lib/feature/browser/approvals_listener/actions/send_message/send_message_model.dart
@@ -61,11 +61,15 @@ class SendMessageModel extends ElementaryModel {
     return _nekotonRepository.prepareTransfer(
       address: address,
       publicKey: publicKey,
-      destination: destination,
-      amount: amount,
-      body: body,
-      bounce: bounce,
       expiration: defaultSendTimeout,
+      params: [
+        TonWalletTransferParams(
+          destination: destination,
+          amount: amount,
+          body: body,
+          bounce: defaultMessageBounce,
+        ),
+      ],
     );
   }
 

diff --git a/lib/feature/browser/inpage_provider/inpage_provider.dart b/lib/feature/browser/inpage_provider/inpage_provider.dart
@@ -428,12 +428,16 @@ class InpageProvider extends ProviderApi {
       }
 
       final unsignedMessage = await nekotonRepository.prepareTransfer(
-        destination: repackedRecipient,
-        amount: amount,
-        body: body,
-        bounce: defaultMessageBounce,
         address: sender,
         expiration: defaultSendTimeout,
+        params: [
+          nr.TonWalletTransferParams(
+            destination: repackedRecipient,
+            amount: amount,
+            body: body,
+            bounce: defaultMessageBounce,
+          ),
+        ],
       );
 
       final fees = await nekotonRepository.estimateFees(
@@ -1168,12 +1172,16 @@ class InpageProvider extends ProviderApi {
 
       final unsignedMessage = await nekotonRepository.prepareTransfer(
         address: sender,
-        destination: repackedRecipient,
-        amount: amount,
-        body: body,
-        bounce: defaultMessageBounce,
         expiration: defaultSendTimeout,
         publicKey: key,
+        params: [
+          nr.TonWalletTransferParams(
+            destination: repackedRecipient,
+            amount: amount,
+            body: body,
+            bounce: defaultMessageBounce,
+          ),
+        ],
       );
 
       await unsignedMessage.message.refreshTimeout();
@@ -1270,12 +1278,16 @@ class InpageProvider extends ProviderApi {
 
       final unsignedMessage = await nekotonRepository.prepareTransfer(
         address: sender,
-        destination: repackedRecipient,
-        amount: amount,
-        body: body,
-        bounce: defaultMessageBounce,
         expiration: defaultSendTimeout,
         publicKey: key,
+        params: [
+          nr.TonWalletTransferParams(
+            destination: repackedRecipient,
+            amount: amount,
+            body: body,
+            bounce: defaultMessageBounce,
+          ),
+        ],
       );
 
       await unsignedMessage.message.refreshTimeout();

diff --git a/lib/feature/wallet/token_wallet_send/bloc/token_wallet_send_bloc.dart b/lib/feature/wallet/token_wallet_send/bloc/token_wallet_send_bloc.dart
@@ -246,11 +246,15 @@ class TokenWalletSendBloc
     final unsignedMessage = await nekotonRepository.prepareTransfer(
       address: owner,
       publicKey: publicKey,
-      destination: internalMessage.destination,
-      amount: internalMessage.amount,
-      body: internalMessage.body,
-      bounce: defaultMessageBounce,
       expiration: defaultSendTimeout,
+      params: [
+        TonWalletTransferParams(
+          destination: internalMessage.destination,
+          amount: internalMessage.amount,
+          body: internalMessage.body,
+          bounce: defaultMessageBounce,
+        ),
+      ],
     );
 
     return (internalMessage, unsignedMessage);

diff --git a/lib/feature/wallet/ton_wallet_send/bloc/ton_wallet_send_bloc.dart b/lib/feature/wallet/ton_wallet_send/bloc/ton_wallet_send_bloc.dart
@@ -198,10 +198,14 @@ class TonWalletSendBloc extends Bloc<TonWalletSendEvent, TonWalletSendState>
       nekotonRepository.prepareTransfer(
         address: address,
         publicKey: publicKey,
-        destination: repackAddress(destination),
-        amount: amount,
-        body: comment,
-        bounce: defaultMessageBounce,
         expiration: defaultSendTimeout,
+        params: [
+          TonWalletTransferParams(
+            destination: repackAddress(destination),
+            amount: amount,
+            body: comment,
+            bounce: defaultMessageBounce,
+          ),
+        ],
       );
 }
diff --git a/pubspec.yaml b/pubspec.yaml
@@ -56,7 +56,7 @@ dependencies:
   mobile_scanner: 5.2.3
   money2: 5.3.0 # do not update to 5.4.0 due to json serialization issues
   money2_fixer: 2.0.0
-  nekoton_repository: 0.51.0-dev.2
+  nekoton_repository: 0.51.0-dev.4
   nekoton_webview: 0.1.8
   ntp: 2.0.0
   package_info_plus: 8.1.3