Ledger Wallet support

KingGorrin · Jan 18, 2024 · 23d9b01 · 23d9b01
1 parent 267950f
commit 23d9b01
Show file tree

Hide file tree

Showing 51 changed files with 1,083 additions and 282 deletions.
diff --git a/lib/blocs/auto_receive_tx_worker.dart b/lib/blocs/auto_receive_tx_worker.dart
@@ -9,6 +9,7 @@ import 'package:zenon_syrius_wallet_flutter/main.dart';
 import 'package:zenon_syrius_wallet_flutter/model/model.dart';
 import 'package:zenon_syrius_wallet_flutter/utils/account_block_utils.dart';
 import 'package:zenon_syrius_wallet_flutter/utils/address_utils.dart';
+import 'package:zenon_syrius_wallet_flutter/utils/extensions.dart';
 import 'package:zenon_syrius_wallet_flutter/utils/global.dart';
 import 'package:znn_sdk_dart/znn_sdk_dart.dart';
 
@@ -33,17 +34,16 @@ class AutoReceiveTxWorker extends BaseBloc<WalletNotification> {
             (await zenon!.ledger.getAccountBlockByHash(currentHash))!
                 .toAddress
                 .toString();
-        KeyPair keyPair = kKeyStore!.getKeyPair(
-          kDefaultAddressList.indexOf(toAddress),
-        );
+        WalletAccount walletAccount =
+            await kWalletFile!.account(kDefaultAddressList.indexOf(toAddress));
         AccountBlockTemplate transactionParams = AccountBlockTemplate.receive(
           currentHash,
         );
         AccountBlockTemplate response =
             await AccountBlockUtils.createAccountBlock(
           transactionParams,
           'receive transaction',
-          blockSigningKey: keyPair,
+          walletAccount: walletAccount,
           waitForRequiredPlasma: true,
         );
         pool.removeFirst();

diff --git a/lib/blocs/auto_unlock_htlc_worker.dart b/lib/blocs/auto_unlock_htlc_worker.dart
@@ -9,6 +9,7 @@ import 'package:zenon_syrius_wallet_flutter/model/database/notification_type.dar
 import 'package:zenon_syrius_wallet_flutter/model/database/wallet_notification.dart';
 import 'package:zenon_syrius_wallet_flutter/utils/account_block_utils.dart';
 import 'package:zenon_syrius_wallet_flutter/utils/address_utils.dart';
+import 'package:zenon_syrius_wallet_flutter/utils/extensions.dart';
 import 'package:zenon_syrius_wallet_flutter/utils/format_utils.dart';
 import 'package:zenon_syrius_wallet_flutter/utils/global.dart';
 import 'package:znn_sdk_dart/znn_sdk_dart.dart';
@@ -25,7 +26,7 @@ class AutoUnlockHtlcWorker extends BaseBloc<WalletNotification> {
   }
 
   Future<void> autoUnlock() async {
-    if (pool.isNotEmpty && !running && kKeyStore != null) {
+    if (pool.isNotEmpty && !running && kWalletFile != null) {
       running = true;
       Hash currentHash = pool.first;
       try {
@@ -38,16 +39,15 @@ class AutoUnlockHtlcWorker extends BaseBloc<WalletNotification> {
         if (!kDefaultAddressList.contains(htlc.hashLocked.toString())) {
           throw 'Swap address not in default addresses. Please add the address in the addresses list.';
         }
-        KeyPair? keyPair = kKeyStore!.getKeyPair(
-          kDefaultAddressList.indexOf(htlc.hashLocked.toString()),
-        );
+        WalletAccount walletAccount = await kWalletFile!.account(
+            kDefaultAddressList.indexOf(htlc.hashLocked.toString()));
         AccountBlockTemplate transactionParams = zenon!.embedded.htlc
             .unlock(htlc.id, FormatUtils.decodeHexString(swap.preimage!));
         AccountBlockTemplate response =
             await AccountBlockUtils.createAccountBlock(
           transactionParams,
           'complete swap',
-          blockSigningKey: keyPair,
+          walletAccount: walletAccount,
           waitForRequiredPlasma: true,
         );
         _sendSuccessNotification(response, htlc.hashLocked.toString());

diff --git a/lib/blocs/blocs.dart b/lib/blocs/blocs.dart
@@ -4,10 +4,10 @@ export 'auto_receive_tx_worker.dart';
 export 'base_bloc.dart';
 export 'base_bloc_for_reloading_indicator.dart';
 export 'base_bloc_with_refresh_mixin.dart';
-export 'decrypt_key_store_bloc.dart';
+export 'decrypt_wallet_file_bloc.dart';
 export 'hide_widget_status_bloc.dart';
 export 'infinite_scroll_bloc.dart';
-export 'key_store_path_bloc.dart';
+export 'key_store_file_bloc.dart';
 export 'lock_bloc.dart';
 export 'node_sync_status_bloc.dart';
 export 'notifications_bloc.dart';

diff --git a/lib/blocs/decrypt_key_store_bloc.dart b/lib/blocs/decrypt_key_store_bloc.dart
diff --git a/lib/blocs/decrypt_wallet_file_bloc.dart b/lib/blocs/decrypt_wallet_file_bloc.dart
@@ -0,0 +1,15 @@
+import 'package:zenon_syrius_wallet_flutter/blocs/blocs.dart';
+import 'package:zenon_syrius_wallet_flutter/utils/wallet_file.dart';
+import 'package:zenon_syrius_wallet_flutter/utils/wallet_utils.dart';
+
+class DecryptWalletFileBloc extends BaseBloc<WalletFile?> {
+  Future<void> decryptWalletFile(String type, String path, String password) async {
+    try {
+      addEvent(null);
+      final walletFile = await WalletUtils.decryptWalletFile(type, path, password);
+      addEvent(walletFile);
+    } catch (e, stackTrace) {
+      addError(e, stackTrace);
+    }
+  }
+}
diff --git a/lib/blocs/hide_widget_status_bloc.dart b/lib/blocs/hide_widget_status_bloc.dart
@@ -2,7 +2,7 @@ import 'package:zenon_syrius_wallet_flutter/blocs/blocs.dart';
 import 'package:zenon_syrius_wallet_flutter/main.dart';
 import 'package:zenon_syrius_wallet_flutter/utils/constants.dart';
 import 'package:zenon_syrius_wallet_flutter/utils/global.dart';
-import 'package:zenon_syrius_wallet_flutter/utils/keystore_utils.dart';
+import 'package:zenon_syrius_wallet_flutter/utils/wallet_utils.dart';
 import 'package:zenon_syrius_wallet_flutter/utils/widget_utils.dart';
 import 'package:znn_sdk_dart/znn_sdk_dart.dart';
 
@@ -15,7 +15,8 @@ class HideWidgetStatusBloc extends BaseBloc<bool?> {
     try {
       addEvent(null);
       if (!isHidden) {
-        await KeyStoreUtils.decryptKeyStoreFile(kKeyStorePath!, password);
+        await WalletUtils.decryptWalletFile(
+            kWalletType!, kWalletPath!, password);
       }
       await _markWidgetAsHidden(widgetTitle, isHidden);
       addEvent(isHidden);

diff --git a/lib/blocs/key_store_file_bloc.dart b/lib/blocs/key_store_file_bloc.dart
@@ -0,0 +1,25 @@
+import 'dart:async';
+import 'dart:convert';
+
+import 'package:zenon_syrius_wallet_flutter/blocs/blocs.dart';
+import 'package:zenon_syrius_wallet_flutter/utils/global.dart';
+import 'package:zenon_syrius_wallet_flutter/utils/wallet_utils.dart';
+import 'package:zenon_syrius_wallet_flutter/utils/init_utils.dart';
+import 'package:zenon_syrius_wallet_flutter/utils/wallet_file.dart';
+import 'package:znn_sdk_dart/znn_sdk_dart.dart';
+
+class KeyStoreFileBloc extends BaseBloc<KeyStoreWalletFile?> {
+  Future<void> getKeyStorePath(
+    String mnemonic,
+    String password,
+  ) async {
+    try {
+      await WalletUtils.createKeyStoreWalletFile(mnemonic, password);
+      await InitUtils.initWalletAfterDecryption(
+          Crypto.digest(utf8.encode(password)));
+      addEvent(kWalletFile as KeyStoreWalletFile);
+    } catch (e, stackTrace) {
+      addError(e, stackTrace);
+    }
+  }
+}
diff --git a/lib/blocs/key_store_path_bloc.dart b/lib/blocs/key_store_path_bloc.dart
diff --git a/lib/blocs/ledger_wallet_file_bloc.dart b/lib/blocs/ledger_wallet_file_bloc.dart
@@ -0,0 +1,26 @@
+import 'dart:async';
+import 'dart:convert';
+
+import 'package:zenon_syrius_wallet_flutter/blocs/blocs.dart';
+import 'package:zenon_syrius_wallet_flutter/utils/global.dart';
+import 'package:zenon_syrius_wallet_flutter/utils/wallet_utils.dart';
+import 'package:zenon_syrius_wallet_flutter/utils/init_utils.dart';
+import 'package:zenon_syrius_wallet_flutter/utils/wallet_file.dart';
+import 'package:znn_sdk_dart/znn_sdk_dart.dart';
+
+class LedgerWalletFileBloc extends BaseBloc<LedgerWalletFile?> {
+  Future<void> getLedgerWalletPath(
+    String walletId,
+    String password,
+  ) async {
+    try {
+      await WalletUtils.createLedgerWalletFile(
+          walletId, password);
+      await InitUtils.initWalletAfterDecryption(
+          Crypto.digest(utf8.encode(password)));
+      addEvent(kWalletFile as LedgerWalletFile);
+    } catch (e, stackTrace) {
+      addError(e, stackTrace);
+    }
+  }
+}
diff --git a/lib/blocs/p2p_swap/htlc_swap/complete_htlc_swap_bloc.dart b/lib/blocs/p2p_swap/htlc_swap/complete_htlc_swap_bloc.dart
@@ -30,11 +30,11 @@ class CompleteHtlcSwapBloc extends BaseBloc<HtlcSwap?> {
 
       AccountBlockTemplate transactionParams = zenon!.embedded.htlc.unlock(
           Hash.parse(htlcId), FormatUtils.decodeHexString(swap.preimage!));
-      KeyPair blockSigningKeyPair = kKeyStore!.getKeyPair(
+      WalletAccount walletAccount = await kWalletFile!.account(
         kDefaultAddressList.indexOf(swap.selfAddress.toString()),
       );
       AccountBlockUtils.createAccountBlock(transactionParams, 'complete swap',
-              blockSigningKey: blockSigningKeyPair, waitForRequiredPlasma: true)
+              walletAccount: walletAccount, waitForRequiredPlasma: true)
           .then(
         (response) async {
           swap.state = P2pSwapState.completed;

diff --git a/lib/blocs/p2p_swap/htlc_swap/join_htlc_swap_bloc.dart b/lib/blocs/p2p_swap/htlc_swap/join_htlc_swap_bloc.dart
@@ -5,6 +5,7 @@ import 'package:zenon_syrius_wallet_flutter/model/p2p_swap/p2p_swap.dart';
 import 'package:zenon_syrius_wallet_flutter/utils/account_block_utils.dart';
 import 'package:zenon_syrius_wallet_flutter/utils/address_utils.dart';
 import 'package:zenon_syrius_wallet_flutter/utils/date_time_utils.dart';
+import 'package:zenon_syrius_wallet_flutter/utils/extensions.dart';
 import 'package:zenon_syrius_wallet_flutter/utils/format_utils.dart';
 import 'package:zenon_syrius_wallet_flutter/utils/global.dart';
 import 'package:znn_sdk_dart/znn_sdk_dart.dart';
@@ -19,7 +20,7 @@ class JoinHtlcSwapBloc extends BaseBloc<HtlcSwap?> {
     required P2pSwapChain fromChain,
     required P2pSwapChain toChain,
     required int counterHtlcExpirationTime,
-  }) {
+  }) async {
     try {
       addEvent(null);
       AccountBlockTemplate transactionParams = zenon!.embedded.htlc.create(
@@ -31,11 +32,11 @@ class JoinHtlcSwapBloc extends BaseBloc<HtlcSwap?> {
         initialHtlc.keyMaxSize,
         initialHtlc.hashLock,
       );
-      KeyPair blockSigningKeyPair = kKeyStore!.getKeyPair(
+      WalletAccount walletAccount = await kWalletFile!.account(
         kDefaultAddressList.indexOf(initialHtlc.hashLocked.toString()),
       );
       AccountBlockUtils.createAccountBlock(transactionParams, 'join swap',
-              blockSigningKey: blockSigningKeyPair, waitForRequiredPlasma: true)
+              walletAccount: walletAccount, waitForRequiredPlasma: true)
           .then(
         (response) async {
           final swap = HtlcSwap(

diff --git a/lib/blocs/p2p_swap/htlc_swap/reclaim_htlc_swap_funds_bloc.dart b/lib/blocs/p2p_swap/htlc_swap/reclaim_htlc_swap_funds_bloc.dart
@@ -2,24 +2,25 @@ import 'package:zenon_syrius_wallet_flutter/blocs/base_bloc.dart';
 import 'package:zenon_syrius_wallet_flutter/main.dart';
 import 'package:zenon_syrius_wallet_flutter/utils/account_block_utils.dart';
 import 'package:zenon_syrius_wallet_flutter/utils/address_utils.dart';
+import 'package:zenon_syrius_wallet_flutter/utils/extensions.dart';
 import 'package:zenon_syrius_wallet_flutter/utils/global.dart';
 import 'package:znn_sdk_dart/znn_sdk_dart.dart';
 
 class ReclaimHtlcSwapFundsBloc extends BaseBloc<AccountBlockTemplate?> {
   void reclaimFunds({
     required Hash htlcId,
     required Address selfAddress,
-  }) {
+  }) async {
     try {
       addEvent(null);
       AccountBlockTemplate transactionParams =
           zenon!.embedded.htlc.reclaim(htlcId);
-      KeyPair blockSigningKeyPair = kKeyStore!.getKeyPair(
+      WalletAccount walletAccount = await kWalletFile!.account(
         kDefaultAddressList.indexOf(selfAddress.toString()),
       );
       AccountBlockUtils.createAccountBlock(
               transactionParams, 'reclaim swap funds',
-              blockSigningKey: blockSigningKeyPair, waitForRequiredPlasma: true)
+              walletAccount: walletAccount, waitForRequiredPlasma: true)
           .then(
         (response) {
           ZenonAddressUtils.refreshBalance();

diff --git a/lib/blocs/p2p_swap/htlc_swap/start_htlc_swap_bloc.dart b/lib/blocs/p2p_swap/htlc_swap/start_htlc_swap_bloc.dart
@@ -7,6 +7,7 @@ import 'package:zenon_syrius_wallet_flutter/model/p2p_swap/p2p_swap.dart';
 import 'package:zenon_syrius_wallet_flutter/utils/account_block_utils.dart';
 import 'package:zenon_syrius_wallet_flutter/utils/address_utils.dart';
 import 'package:zenon_syrius_wallet_flutter/utils/date_time_utils.dart';
+import 'package:zenon_syrius_wallet_flutter/utils/extensions.dart';
 import 'package:zenon_syrius_wallet_flutter/utils/format_utils.dart';
 import 'package:zenon_syrius_wallet_flutter/utils/global.dart';
 import 'package:znn_sdk_dart/znn_sdk_dart.dart';
@@ -37,11 +38,11 @@ class StartHtlcSwapBloc extends BaseBloc<HtlcSwap?> {
         htlcPreimageMaxLength,
         hashLock.getBytes(),
       );
-      KeyPair blockSigningKeyPair = kKeyStore!.getKeyPair(
+      WalletAccount walletAccount = await kWalletFile!.account(
         kDefaultAddressList.indexOf(selfAddress.toString()),
       );
       AccountBlockUtils.createAccountBlock(transactionParams, 'start swap',
-              blockSigningKey: blockSigningKeyPair, waitForRequiredPlasma: true)
+              walletAccount: walletAccount, waitForRequiredPlasma: true)
           .then(
         (response) async {
           final swap = HtlcSwap(

diff --git a/lib/blocs/transfer/send_payment_bloc.dart b/lib/blocs/transfer/send_payment_bloc.dart
@@ -1,6 +1,7 @@
 import 'package:zenon_syrius_wallet_flutter/blocs/blocs.dart';
 import 'package:zenon_syrius_wallet_flutter/utils/account_block_utils.dart';
 import 'package:zenon_syrius_wallet_flutter/utils/address_utils.dart';
+import 'package:zenon_syrius_wallet_flutter/utils/extensions.dart';
 import 'package:zenon_syrius_wallet_flutter/utils/global.dart';
 import 'package:znn_sdk_dart/znn_sdk_dart.dart';
 
@@ -13,7 +14,7 @@ class SendPaymentBloc extends BaseBloc<AccountBlockTemplate?> {
     List<int>? data,
     Token? token,
     AccountBlockTemplate? block,
-  }) {
+  }) async {
     assert(
       block == null &&
               fromAddress != null &&
@@ -31,13 +32,13 @@ class SendPaymentBloc extends BaseBloc<AccountBlockTemplate?> {
             amount!,
             data,
           );
-      KeyPair blockSigningKeyPair = kKeyStore!.getKeyPair(
+      WalletAccount walletAccount = await kWalletFile!.account(
         kDefaultAddressList.indexOf(fromAddress),
       );
       AccountBlockUtils.createAccountBlock(
         accountBlock,
         'send transaction',
-        blockSigningKey: blockSigningKeyPair,
+        walletAccount: walletAccount,
         waitForRequiredPlasma: true,
       ).then(
         (response) {

diff --git a/lib/model/database/notification_type.dart b/lib/model/database/notification_type.dart
@@ -49,4 +49,7 @@ enum NotificationType {
 
   @HiveField(14)
   delete,
+
+  @HiveField(15)
+  confirm,
 }
diff --git a/lib/model/database/notification_type.g.dart b/lib/model/database/notification_type.g.dart
diff --git a/lib/model/database/wallet_notification.dart b/lib/model/database/wallet_notification.dart
@@ -78,6 +78,9 @@ class WalletNotification extends HiveObject {
         return _getCircledIcon(Icons.link);
       case NotificationType.delete:
         return _getCircledIcon(Icons.delete_forever);
+      case NotificationType.confirm:
+        return _getCircledIcon(Icons.remove_red_eye,
+            iconColor: AppColors.alertNotification);
       default:
         return _getCircledIcon(MaterialCommunityIcons.arrow_top_right);
     }