cake-tech · OmarHatem28 · Jan 24, 2025 · Oct 2, 2023 · Oct 13, 2023 · Oct 13, 2023
diff --git a/cw_core/lib/monero_wallet_keys.dart b/cw_core/lib/monero_wallet_keys.dart
@@ -4,11 +4,13 @@ class MoneroWalletKeys {
         required this.privateSpendKey,
         required this.privateViewKey,
         required this.publicSpendKey,
-        required this.publicViewKey});
+        required this.publicViewKey,
+        required this.passphrase});
 
   final String primaryAddress;
   final String publicViewKey;
   final String privateViewKey;
   final String publicSpendKey;
   final String privateSpendKey;
+  final String passphrase;
 }
diff --git a/cw_haven/lib/haven_wallet.dart b/cw_haven/lib/haven_wallet.dart
@@ -78,7 +78,8 @@ abstract class HavenWalletBase
       privateSpendKey: haven_wallet.getSecretSpendKey(),
       privateViewKey: haven_wallet.getSecretViewKey(),
       publicSpendKey: haven_wallet.getPublicSpendKey(),
-      publicViewKey: haven_wallet.getPublicViewKey());
+      publicViewKey: haven_wallet.getPublicViewKey(),
+      passphrase: "");
 
   haven_wallet.SyncListener? _listener;
   ReactionDisposer? _onAccountChangeReaction;

diff --git a/cw_monero/lib/api/wallet.dart b/cw_monero/lib/api/wallet.dart
@@ -44,13 +44,17 @@ String getSeed() {
 
   if (cakepolyseed != "") {
     if (cakepassphrase != "") {
-      final lang = PolyseedLang.getByPhrase(cakepassphrase);
-      final coin = PolyseedCoin.POLYSEED_MONERO;
-      final ps = Polyseed.decode(cakepolyseed, lang, coin);
-      final passphrase = getPassphrase();
-      if (ps.isEncrypted || passphrase == "") return ps.encode(lang, coin);
-      ps.crypt(getPassphrase());
-      return ps.encode(lang, coin);
+      try {
+        final lang = PolyseedLang.getByPhrase(cakepassphrase);
+        final coin = PolyseedCoin.POLYSEED_MONERO;
+        final ps = Polyseed.decode(cakepolyseed, lang, coin);
+        final passphrase = getPassphrase();
+        if (ps.isEncrypted || passphrase == "") return ps.encode(lang, coin);
+        ps.crypt(getPassphrase());
+        return ps.encode(lang, coin);
+      } catch (e) {
+        printV(e);
+      }
     }
     return cakepolyseed;
   }

diff --git a/cw_monero/lib/api/wallet_manager.dart b/cw_monero/lib/api/wallet_manager.dart
@@ -205,7 +205,7 @@ void restoreWalletFromPolyseedWithOffset(
     required String seedOffset,
     required String language,
     int nettype = 0}) {
-  
+
   txhistory = null;
   final newWptr = monero.WalletManager_createWalletFromPolyseed(
     wmPtr,
@@ -231,7 +231,7 @@ void restoreWalletFromPolyseedWithOffset(
 
   monero.Wallet_setCacheAttribute(wptr!, key: "cakewallet.seed", value: seed);
   monero.Wallet_setCacheAttribute(wptr!, key: "cakewallet.passphrase", value: seedOffset);
-
+  monero.Wallet_store(wptr!);
   storeSync();
 
   openedWalletsByPath[path] = wptr!;

diff --git a/cw_monero/lib/monero_wallet.dart b/cw_monero/lib/monero_wallet.dart
@@ -131,7 +131,8 @@ abstract class MoneroWalletBase extends WalletBase<MoneroBalance,
       privateSpendKey: monero_wallet.getSecretSpendKey(),
       privateViewKey: monero_wallet.getSecretViewKey(),
       publicSpendKey: monero_wallet.getPublicSpendKey(),
-      publicViewKey: monero_wallet.getPublicViewKey());
+      publicViewKey: monero_wallet.getPublicViewKey(),
+      passphrase: monero_wallet.getPassphrase());
 
   int? get restoreHeight =>
       transactionHistory.transactions.values.firstOrNull?.height;

diff --git a/cw_monero/pubspec.lock b/cw_monero/pubspec.lock
@@ -511,8 +511,8 @@ packages:
     dependency: "direct main"
     description:
       path: "impls/monero.dart"
-      ref: c3dd64bdee37d361a2c1252d127fb575936e43e6
-      resolved-ref: c3dd64bdee37d361a2c1252d127fb575936e43e6
+      ref: 9526921acb774b523a2e1d9ba9a7b389acfc6b70
+      resolved-ref: 9526921acb774b523a2e1d9ba9a7b389acfc6b70
       url: "https://github.com/mrcyjanek/monero_c"
     source: git
     version: "0.0.0"

diff --git a/cw_monero/pubspec.yaml b/cw_monero/pubspec.yaml
@@ -25,7 +25,7 @@ dependencies:
   monero:
     git:
       url: https://github.com/mrcyjanek/monero_c
-      ref: c3dd64bdee37d361a2c1252d127fb575936e43e6
+      ref: 9526921acb774b523a2e1d9ba9a7b389acfc6b70
       path: impls/monero.dart
   mutex: ^3.1.0
   ledger_flutter_plus: ^1.4.1

diff --git a/cw_wownero/lib/api/wallet.dart b/cw_wownero/lib/api/wallet.dart
@@ -43,13 +43,17 @@ String getSeed() {
 
   if (cakepolyseed != "") {
     if (cakepassphrase != "") {
-      final lang = PolyseedLang.getByPhrase(cakepassphrase);
-      final coin = PolyseedCoin.POLYSEED_MONERO;
-      final ps = Polyseed.decode(cakepolyseed, lang, coin);
-      final passphrase = getPassphrase();
-      if (ps.isEncrypted || passphrase == "") return ps.encode(lang, coin);
-      ps.crypt(passphrase);
-      return ps.encode(lang, coin);
+      try {
+        final lang = PolyseedLang.getByPhrase(cakepassphrase);
+        final coin = PolyseedCoin.POLYSEED_WOWNERO;
+        final ps = Polyseed.decode(cakepolyseed, lang, coin);
+        final passphrase = getPassphrase();
+        if (ps.isEncrypted || passphrase == "") return ps.encode(lang, coin);
+        ps.crypt(passphrase);
+        return ps.encode(lang, coin);
+      } catch (e) {
+        printV(e);
+      }
     }
     return cakepolyseed;
   }

diff --git a/cw_wownero/lib/api/wallet_manager.dart b/cw_wownero/lib/api/wallet_manager.dart
@@ -130,9 +130,10 @@ void restoreWalletFromSeedSync(
   }
 
   wptr = newWptr;
-  wownero.Wallet_setCacheAttribute(wptr!, key: "cakewallet.seed", value: seed);
+
   wownero.Wallet_setCacheAttribute(wptr!, key: "cakewallet.passphrase", value: passphrase);
-
+  wownero.Wallet_setCacheAttribute(wptr!, key: "cakewallet.seed", value: seed);
+
   openedWalletsByPath[path] = wptr!;
 
   store();

diff --git a/cw_wownero/lib/wownero_wallet.dart b/cw_wownero/lib/wownero_wallet.dart
@@ -128,7 +128,8 @@ abstract class WowneroWalletBase
       privateSpendKey: wownero_wallet.getSecretSpendKey(),
       privateViewKey: wownero_wallet.getSecretViewKey(),
       publicSpendKey: wownero_wallet.getPublicSpendKey(),
-      publicViewKey: wownero_wallet.getPublicViewKey());
+      publicViewKey: wownero_wallet.getPublicViewKey(),
+      passphrase: wownero_wallet.getPassphrase());
 
   wownero_wallet.SyncListener? _listener;
   ReactionDisposer? _onAccountChangeReaction;

diff --git a/cw_wownero/pubspec.lock b/cw_wownero/pubspec.lock
@@ -471,8 +471,8 @@ packages:
     dependency: "direct main"
     description:
       path: "impls/monero.dart"
-      ref: c3dd64bdee37d361a2c1252d127fb575936e43e6
-      resolved-ref: c3dd64bdee37d361a2c1252d127fb575936e43e6
+      ref: 9526921acb774b523a2e1d9ba9a7b389acfc6b70
+      resolved-ref: 9526921acb774b523a2e1d9ba9a7b389acfc6b70
       url: "https://github.com/mrcyjanek/monero_c"
     source: git
     version: "0.0.0"

diff --git a/cw_wownero/pubspec.yaml b/cw_wownero/pubspec.yaml
@@ -25,7 +25,7 @@ dependencies:
   monero:
     git:
       url: https://github.com/mrcyjanek/monero_c
-      ref: c3dd64bdee37d361a2c1252d127fb575936e43e6 # monero_c hash
+      ref: 9526921acb774b523a2e1d9ba9a7b389acfc6b70 # monero_c hash
       path: impls/monero.dart
   mutex: ^3.1.0