From 345a600599afb146d534219260e013d196048cbb Mon Sep 17 00:00:00 2001
From: poka <poka@p2p.legal>
Date: Fri, 20 May 2022 07:22:57 +0200
Subject: [PATCH] Change derivation %3 to %2; Harden derivation

---
 lib/providers/my_wallets.dart    | 7 ++++---
 lib/providers/substrate_sdk.dart | 2 +-
 lib/screens/settings.dart        | 3 ++-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/lib/providers/my_wallets.dart b/lib/providers/my_wallets.dart
index 1144cba..cde7fca 100644
--- a/lib/providers/my_wallets.dart
+++ b/lib/providers/my_wallets.dart
@@ -126,10 +126,10 @@ class MyWalletsProvider with ChangeNotifier {
     List<WalletData> _walletConfig = readAllWallets(_chest);
 
     if (_walletConfig.isEmpty) {
-      _newDerivationNbr = 3;
+      _newDerivationNbr = 2;
       _newWalletNbr = 0;
     } else {
-      _newDerivationNbr = _walletConfig.last.derivation! + 3;
+      _newDerivationNbr = _walletConfig.last.derivation! + 2;
       _newWalletNbr = _walletConfig.last.number! + 1;
     }
 
@@ -141,7 +141,8 @@ class MyWalletsProvider with ChangeNotifier {
     final int? _currentChestNumber = myWalletProvider.getCurrentChest();
     final ChestData _currentChest = chestBox.get(_currentChestNumber)!;
 
-    final address = await _sdk.derive(context, _currentChest.address!, _newDerivationNbr, pinCode);
+    final address = await _sdk.derive(
+        context, _currentChest.address!, _newDerivationNbr, pinCode);
 
     WalletData newWallet = WalletData(
         chest: _chest,
diff --git a/lib/providers/substrate_sdk.dart b/lib/providers/substrate_sdk.dart
index 06e5acb..6f65f58 100644
--- a/lib/providers/substrate_sdk.dart
+++ b/lib/providers/substrate_sdk.dart
@@ -299,7 +299,7 @@ class SubstrateSdk with ChangeNotifier {
     print(generatedMnemonic);
     print(sourceDerivation);
 
-    return await importAccount(fromMnemonic: true, derivePath: '/$number');
+    return await importAccount(fromMnemonic: true, derivePath: '//$number');
   }
 }
 
diff --git a/lib/screens/settings.dart b/lib/screens/settings.dart
index 09738ee..6d5df23 100644
--- a/lib/screens/settings.dart
+++ b/lib/screens/settings.dart
@@ -124,7 +124,8 @@ class SettingsScreen extends StatelessWidget {
                           ),
                           onPressed: () async => {
                                 log.i('Suppression de tous les wallets'),
-                                await _myWallets.deleteAllWallet(context)
+                                await _myWallets.deleteAllWallet(context),
+                                await _sub.deleteAllAccounts()
                               },
                           child: const Text("EFFACER TOUS MES PORTEFEUILLES",
                               style: TextStyle(fontSize: 20)))))),