save wallet private key hex

bumped windows version
Liso-Vault · Aug 4, 2022 · d60290a · d60290a
1 parent 18d3d82
commit d60290a
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 11 deletions.
diff --git a/lib/core/persistence/persistence.dart b/lib/core/persistence/persistence.dart
@@ -22,6 +22,7 @@ class Persistence extends GetxController with ConsoleMixin {
   final wallet = ''.val('wallet');
   final walletPassword = ''.val('wallet-password');
   final walletSignature = ''.val('wallet-signature');
+  final walletPrivateKeyHex = ''.val('wallet-private-key-hex');
   final walletAddress = ''.val('wallet-address');
   // GENERAL
   final localeCode = 'en'.val('locale-code');

diff --git a/lib/features/unlock/unlock_screen.controller.dart b/lib/features/unlock/unlock_screen.controller.dart
@@ -96,17 +96,19 @@ class UnlockScreenController extends GetxController
       return Get.offNamedUntil(Routes.main, (route) => false);
     }
 
-    if (Persistence.to.walletSignature.val.isNotEmpty) {
+    if (Persistence.to.walletSignature.val.isNotEmpty &&
+        Persistence.to.walletPrivateKeyHex.val.isNotEmpty) {
       return _done();
     }
 
     // temporary to migrate users from prior v0.6.0
     Timer.periodic(1.seconds, (timer) async {
-      if (Persistence.to.walletSignature.val.isNotEmpty) {
+      if (Persistence.to.walletSignature.val.isNotEmpty &&
+          Persistence.to.walletPrivateKeyHex.val.isNotEmpty) {
         timer.cancel();
         return _done();
       } else {
-        console.info('wallet signature still not present');
+        console.info('wallet still not saved to persistence');
       }
     });
   }

diff --git a/lib/features/wallet/wallet.service.dart b/lib/features/wallet/wallet.service.dart
@@ -42,8 +42,8 @@ class WalletService extends GetxService with ConsoleMixin {
 
   bool get isSaved => Persistence.to.wallet.val.isNotEmpty;
 
-  Uint8List get privateKey => wallet!.privateKey.privateKey;
-  String get privateKeyHex => HEX.encode(privateKey);
+  // Uint8List get privateKey => wallet!.privateKey.privateKey;
+  // String get privateKeyHex => HEX.encode(privateKey);
 
   EthereumAddress get address => wallet!.privateKey.address;
 
@@ -136,7 +136,9 @@ class WalletService extends GetxService with ConsoleMixin {
     Uint8List? privateKey_,
   }) async {
     final messageBytes = Uint8List.fromList(utf8.encode(message));
-    final privateKeyHex = HEX.encode(privateKey_ ?? privateKey);
+    final privateKeyHex = privateKey_ != null
+        ? HEX.encode(privateKey_)
+        : Persistence.to.walletPrivateKeyHex.val;
     // console.info('message: $message');
 
     final signature = await compute(signMessage, {
@@ -192,6 +194,8 @@ class WalletService extends GetxService with ConsoleMixin {
     // generate cipher key
     final signature = await sign(kCipherKeySignatureMessage);
     Persistence.to.walletSignature.val = signature;
+    Persistence.to.walletPrivateKeyHex.val =
+        HEX.encode(wallet!.privateKey.privateKey);
     // // from the first 32 bits of the signature
     // cipherKey = Uint8List.fromList(utf8.encode(signature).sublist(0, 32));
 
@@ -235,7 +239,7 @@ class WalletService extends GetxService with ConsoleMixin {
         e.readOnly = true;
         return e;
       } else if (e.identifier == 'private_key') {
-        e.data.value = privateKeyHex;
+        e.data.value = Persistence.to.walletPrivateKeyHex.val;
         e.readOnly = true;
         return e;
       } else if (e.identifier == 'address') {

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -16,8 +16,12 @@ dependencies:
   # CRYTPOGRAPHY + SECURITY
   secrets:
     path: ../secrets
-  alchemy_web3:
-    git: https://github.com/oliverbytes/alchemy_web3.git
+  # alchemy_web3:
+    # git: https://github.com/oliverbytes/alchemy_web3.git
+  alchemy_web3: 
+    git: 
+      url: https://github.com/oliverbytes/alchemy_web3.git
+      ref: ee496edc0bc0a1d64d7cc5c7ea8662b4b8d4f0fc
   web3dart: ^2.3.5 # Ethereum
   eth_sig_util: ^0.0.9 # Ethereum signature
   bip39: ^1.0.6 # Mnemonic Seed Phrases

diff --git a/windows/runner/Runner.rc b/windows/runner/Runner.rc
@@ -63,13 +63,13 @@ IDI_APP_ICON            ICON                    "resources\\app_icon.ico"
 #ifdef FLUTTER_BUILD_NUMBER
 #define VERSION_AS_NUMBER FLUTTER_BUILD_NUMBER
 #else
-#define VERSION_AS_NUMBER 0,6,032,0
+#define VERSION_AS_NUMBER 0,6,033,0
 #endif
 
 #ifdef FLUTTER_BUILD_NAME
 #define VERSION_AS_STRING #FLUTTER_BUILD_NAME
 #else
-#define VERSION_AS_STRING "0.6.0+32"
+#define VERSION_AS_STRING "0.6.0+33"
 #endif
 
 VS_VERSION_INFO VERSIONINFO