Adjust tx load limit (MixinNetwork#310)

* bump mixin sdk to latest

* adjust tx loadlimit

* enable publish

Author: boyan01

.github/workflows/main.yml

@@ -60,3 +60,11 @@ jobs:
       - name: Build APP
         run: flutter build web --web-renderer html --release --base-href /mixin-wallet/
 
+      - name: Deploy
+        uses: peaceiris/actions-gh-pages@v3
+        if: ${{ github.ref == 'refs/heads/main' }}
+        with:
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          publish_dir: ./build/web/
+          force_orphan: true
+

lib/db/dao/asset_dao.dart

@@ -21,6 +21,22 @@ AssetResults$orderBy defaultOrderBy = (asset, _, c, __, f) {
   ]);
 };
 
+extension on sdk.Token {
+  AssetsCompanion get asAssetsCompanion => AssetsCompanion(
+        assetId: Value(assetId),
+        symbol: Value(symbol),
+        name: Value(name),
+        iconUrl: Value(iconUrl),
+        assetKey: Value(assetKey),
+        priceBtc: Value(priceBtc),
+        priceUsd: Value(priceUsd),
+        chainId: Value(chainId),
+        changeUsd: Value(changeUsd),
+        changeBtc: Value(changeBtc),
+        confirmations: Value(confirmations),
+      );
+}
+
 extension AssetConverter on sdk.Asset {
   AssetsCompanion get asAssetsCompanion => AssetsCompanion.insert(
         assetId: assetId,
@@ -72,11 +88,11 @@ class AssetDao extends DatabaseAccessor<MixinDatabase> with _$AssetDaoMixin {
   Future<void> deleteAsset(Asset asset) => delete(db.assets).delete(asset);
 
   Future<void> insertAllOnConflictUpdateWithoutBalance(
-      List<sdk.Asset> assets) async {
+      List<sdk.Token> assets) async {
     await db.batch((batch) {
       batch.insertAllOnConflictUpdate(
         db.assets,
-        assets.map((asset) => asset.asAssetsCompanionWithoutBalance).toList(),
+        assets.map((asset) => asset.asAssetsCompanion).toList(),
       );
     });
   }

lib/service/app_services.dart

@@ -35,7 +35,7 @@ class AppServices extends ChangeNotifier with EquatableMixin {
       client = sdk.Client(
         userId: credential.mixinId,
         sessionId: credential.sessionId,
-        privateKey: credential.privateKey,
+        sessionPrivateKey: sdk.Key.fromBase64(credential.privateKey),
         interceptors: interceptors,
         httpLogLevel: null,
       );
@@ -112,7 +112,7 @@ class AppServices extends ChangeNotifier with EquatableMixin {
     final client = sdk.Client(
       userId: data.mixinId,
       sessionId: data.sessionId,
-      privateKey: data.privateKey,
+      sessionPrivateKey: sdk.Key.fromBase64(data.privateKey),
       interceptors: interceptors,
     );
 
@@ -542,12 +542,13 @@ class AppServices extends ChangeNotifier with EquatableMixin {
   Future<void> searchAndUpdateAsset(String keyword) async {
     if (keyword.isEmpty) return;
     final mixinResponse = await client.assetApi.queryAsset(keyword);
-    final fixedAssets = <sdk.Asset>[];
-    for (final a in mixinResponse.data) {
+    final fixedAssets = <sdk.Token>[];
+    for (var a in mixinResponse.data) {
       if (a.assetId == '47b13785-25e2-3c5c-ac6b-3713e9c31c22') {
-        a.name = 'BitTorrent Old';
-        // ignore: cascade_invocations
-        a.symbol = 'BTTOLD';
+        final json = a.toJson();
+        json['symbol'] = 'BTTOLD';
+        json['name'] = 'BitTorrent Old';
+        a = sdk.Token.fromJson(json);
       }
       fixedAssets.add(a);
     }

lib/service/profile/profile_manager.dart

@@ -1,4 +1,5 @@
 import 'dart:async';
+import 'dart:convert';
 
 import 'package:flutter/cupertino.dart';
 import 'package:hive_flutter/hive_flutter.dart';
@@ -64,10 +65,9 @@ set lastSelectedAddress(String? value) =>
 class _AuthAdapter extends TypeAdapter<Auth?> {
   @override
   Auth? read(BinaryReader reader) {
-    final map = reader.readMap();
+    final json = reader.readString();
     try {
-      return Auth.fromJson(map.map(
-          (key, value) => MapEntry<String, dynamic>(key as String, value)));
+      return Auth.fromJson(jsonDecode(json) as Map<String, dynamic>);
     } catch (error, stacktrace) {
       e('_AuthAdapter: read auth error: $error, $stacktrace');
       return null;
@@ -79,6 +79,10 @@ class _AuthAdapter extends TypeAdapter<Auth?> {
 
   @override
   void write(BinaryWriter writer, Auth? obj) {
-    writer.writeMap(obj?.toJson() ?? {});
+    if (obj == null) {
+      writer.writeString('');
+    } else {
+      writer.writeString(jsonEncode(obj));
+    }
   }
 }

lib/ui/page/asset_detail.dart

@@ -53,7 +53,7 @@ class _AssetSymbolSearch extends HookWidget {
       final response =
           await context.appServices.client.assetApi.queryAsset(symbol);
       await context.mixinDatabase.assetDao
-          .insertAllOnConflictUpdate(response.data);
+          .insertAllOnConflictUpdateWithoutBalance(response.data);
       return response.data.firstOrNull?.assetId;
     }, keys: [symbol]);
 

lib/ui/page/swap.dart

@@ -295,6 +295,7 @@ class _Body extends HookWidget {
                       final memo = buildMixSwapMemo(destAsset.value.assetId);
 
                       if (context.read<AuthProvider>().isLoginByCredential) {
+                        // ignore: deprecated_member_use
                         final api = context.appServices.client.transferApi;
                         final pinCode = await showPinVerifyDialog(context);
                         if (pinCode == null) {

lib/ui/widget/dialog/transfer_bottom_sheet.dart

@@ -1,11 +1,7 @@
 import 'package:decimal/decimal.dart';
-import 'package:dio/dio.dart';
 import 'package:flutter/material.dart';
-import 'package:mixin_bot_sdk_dart/mixin_bot_sdk_dart.dart' as sdk;
-import 'package:uuid/uuid.dart';
 
 import '../../../db/mixin_database.dart';
-import '../../../service/profile/pin_session.dart';
 import '../../../util/constants.dart';
 import '../../../util/extension/extension.dart';
 import '../../../util/pay/external_transfer_uri_parser.dart';
@@ -19,51 +15,23 @@ Future<bool> showTransferToAddressBottomSheet(
   required AssetResult feeAsset,
   required String amount,
   String? memo,
-}) async {
-  final traceId = const Uuid().v4();
-
-  return _showTransferBottomSheet(
-      context,
-      _TransferVerifyBottomSheetBody(
-        displayAddress: address.displayAddress(),
-        asset: asset,
-        amount: amount,
-        description: _FeeText(
-          address: address,
+}) async =>
+    _showTransferBottomSheet(
+        context,
+        _TransferVerifyBottomSheetBody(
+          displayAddress: address.displayAddress(),
           asset: asset,
-          feeAsset: feeAsset,
-        ),
-        addressLabel: address.label,
-        verification: (context, pin) async {
-          try {
-            final api = context.appServices.client.transferApi;
-            final response = await api.withdrawal(
-              sdk.WithdrawalRequest(
-                addressId: address.addressId,
-                amount: amount,
-                pin: encryptPin(context, pin)!,
-                traceId: traceId,
-                memo: memo,
-                fee: address.fee,
-              ),
-            );
-            await context.appServices.mixinDatabase.snapshotDao
-                .insertAll([response.data]);
-            Navigator.of(context).pop(true);
-          } on DioException catch (error) {
-            final mixinError = error.optionMixinError;
-            if (mixinError?.code == sdk.insufficientTransactionFee) {
-              final message = context.l10n
-                  .errorInsufficientTransactionFeeWithAmount(
-                      '${address.fee} ${feeAsset.symbol}');
-              throw ErrorWithFormattedMessage(message);
-            } else {
-              rethrow;
-            }
-          }
-        },
-      ));
-}
+          amount: amount,
+          description: _FeeText(
+            address: address,
+            asset: asset,
+            feeAsset: feeAsset,
+          ),
+          addressLabel: address.label,
+          verification: (context, pin) async {
+            throw UnimplementedError();
+          },
+        ));
 
 Future<bool> showTransferToExternalUrlBottomSheet({
   required BuildContext context,
@@ -80,34 +48,7 @@ Future<bool> showTransferToExternalUrlBottomSheet({
       asset: asset,
       showWithdrawalWithPinTip: false,
       verification: (context, pin) async {
-        try {
-          final api = context.appServices.client.transferApi;
-          final response = await api.withdrawal(
-            sdk.WithdrawalRequest(
-              assetId: asset.assetId,
-              amount: transfer.amount,
-              pin: encryptPin(context, pin)!,
-              traceId: traceId,
-              memo: transfer.memo,
-              fee: fee,
-              destination: transfer.destination,
-              tag: null,
-            ),
-          );
-          await context.appServices.mixinDatabase.snapshotDao
-              .insertAll([response.data]);
-          Navigator.of(context).pop(true);
-        } on DioException catch (error) {
-          final mixinError = error.optionMixinError;
-          if (mixinError?.code == sdk.insufficientTransactionFee) {
-            final message = context.l10n
-                .errorInsufficientTransactionFeeWithAmount(
-                    '$fee ${asset.chainSymbol}');
-            throw ErrorWithFormattedMessage(message);
-          } else {
-            rethrow;
-          }
-        }
+        throw UnimplementedError();
       },
       description: Text('${context.l10n.fee} $fee ${asset.chainSymbol}'),
       displayAddress: transfer.destination,

lib/ui/widget/transactions/transaction_list_controller.dart

@@ -7,7 +7,7 @@ import '../../../db/mixin_database.dart';
 import '../../../util/logger.dart';
 import 'transaction_list.dart';
 
-const _kLoadLimit = 5;
+const _kLoadLimit = 200;
 
 class TransactionListController {
   TransactionListController(
@@ -37,7 +37,7 @@ class TransactionListController {
 
   var _disposed = false;
 
-  Future<void> loadMoreItem() => _loadMoreItem(_pageSize);
+  Future<void> loadMoreItem() => _loadMoreItem(200);
 
   Future<void> _loadMoreItem(int limit) async {
     if (_loading) {
@@ -103,16 +103,16 @@ class TransactionListController {
       return;
     }
 
-    final moreNeedLoad = pageSize - _snapshotItems.length;
+    final moreNeedLoad = pageSize > _snapshotItems.length;
     _pageSize = pageSize;
 
-    if (moreNeedLoad <= 0) {
+    if (!moreNeedLoad) {
       return;
     }
     _autoFillTask?.cancel();
     _autoFillTask = Timer(const Duration(milliseconds: 800), () {
       _autoFillTask = null;
-      _loadMoreItem(moreNeedLoad);
+      loadMoreItem();
     });
   }
 

pubspec.lock

@@ -62,6 +62,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.11.0"
+  base_x:
+    dependency: transitive
+    description:
+      name: base_x
+      sha256: "519abcdafd637d4b6bd7e72fabd8f9264935f804b9b9f6c5d8411c7d52cbf8fd"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.0.1"
   boolean_selector:
     dependency: transitive
     description:
@@ -295,6 +303,15 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "0.3.1"
+  edwards25519:
+    dependency: "direct overridden"
+    description:
+      path: "."
+      ref: "11aea6ee033099e5634f3b21558bf6e34cd3bec6"
+      resolved-ref: "11aea6ee033099e5634f3b21558bf6e34cd3bec6"
+      url: "https://github.com/boyan01/edwards25519.git"
+    source: git
+    version: "1.0.4"
   enum_to_string:
     dependency: transitive
     description:
@@ -599,10 +616,10 @@ packages:
     dependency: "direct main"
     description:
       name: mixin_bot_sdk_dart
-      sha256: "86ea58291c4a0c408de1c3fcec9fa69f9b055d807ccd66d338f0169340f5c6fb"
+      sha256: "639885724c4f9545590e3175b7237b8a50f0f747cb401847c3a7f746116eded4"
       url: "https://pub.dev"
     source: hosted
-    version: "0.4.3"
+    version: "1.2.6"
   mixswap_sdk_dart:
     dependency: "direct main"
     description:
@@ -952,6 +969,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "0.7.2"
+  thirds:
+    dependency: transitive
+    description:
+      name: thirds
+      sha256: c4b90a4e7f2deac52ebcf22dc7ebbc702578a063a739b3c31e4259a884abb951
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.2.0-alpha.1"
   timing:
     dependency: transitive
     description:

pubspec.yaml

@@ -33,7 +33,7 @@ dependencies:
   flutter_localizations:
     sdk: flutter
 
-  mixin_bot_sdk_dart: ^0.4.3
+  mixin_bot_sdk_dart: ^1.2.6
   very_good_analysis: ^6.0.0
   intl: ^0.19.0
   json_annotation: ^4.8.1
@@ -88,6 +88,12 @@ dev_dependencies:
   hive_generator: ^2.0.0
   envied_generator: ^0.5.2
 
+dependency_overrides:
+  edwards25519:
+    git:
+      url: https://github.com/boyan01/edwards25519.git
+      ref: 11aea6ee033099e5634f3b21558bf6e34cd3bec6
+
 # For information on the generic Dart part of this file, see the
 # following page: https://dart.dev/tools/pub/pubspec