fix_: bad node config migration

status-im/status-go@59caca6...d7f725f
status-im · Jan 23, 2025 · 37ef6f3 · 37ef6f3
1 parent 9782ba2
commit 37ef6f3
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 24 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-2.32.0
+2.32.21952
diff --git a/src/status_im/contexts/keycard/effects.cljs b/src/status_im/contexts/keycard/effects.cljs
@@ -86,7 +86,8 @@
 (rf/reg-fx :effects.keycard/login-with-keycard
  (fn [{:keys [key-uid password whisper-private-key]}]
    (native-module/login-account
-    (assoc (profile.config/login)
+    (assoc (merge (profile.config/login)
+                  (profile.config/fix-node-config-migration))
            :keyUid                   key-uid
            :password                 password
            :keycardWhisperPrivateKey whisper-private-key))))

diff --git a/src/status_im/contexts/profile/config.cljs b/src/status_im/contexts/profile/config.cljs
@@ -30,28 +30,35 @@
    :alchemyBaseMainnetToken       config/ALCHEMY_BASE_MAINNET_TOKEN
    :alchemyBaseSepoliaToken       config/ALCHEMY_BASE_SEPOLIA_TOKEN})
 
+(defn- common-config
+  []
+  {:verifyTransactionURL                         config/verify-transaction-url
+   :verifyENSURL                                 config/verify-ens-url
+   :verifyENSContractAddress                     config/verify-ens-contract-address
+   :verifyTransactionChainID                     config/verify-transaction-chain-id
+   :wakuV2LightClient                            true
+   :wakuV2EnableMissingMessageVerification       true
+   :wakuV2EnableStoreConfirmationForMessagesSent false})
+
+(defn fix-node-config-migration
+  []
+  (common-config))
+
 (defn create
   []
   (let [log-enabled? (boolean (not-empty config/log-level))]
-    (assoc
+    (merge
      (login)
-     :deviceName                                   (native-module/get-installation-name)
-     :rootDataDir                                  (native-module/backup-disabled-data-dir)
-     :rootKeystoreDir                              (native-module/keystore-dir)
-     :logLevel                                     (when log-enabled? config/log-level)
-     :logEnabled                                   log-enabled?
-     :logFilePath                                  (native-module/log-file-directory)
-     :verifyTransactionURL                         config/verify-transaction-url
-     :verifyENSURL                                 config/verify-ens-url
-     :verifyENSContractAddress                     config/verify-ens-contract-address
-     :verifyTransactionChainID                     config/verify-transaction-chain-id
-     :wakuV2LightClient                            true
-     :wakuV2Fleet                                  config/fleet
-     ;; NOTE: https://github.com/status-im/status-go/pull/5570#discussion_r1690794119
-     :wakuV2EnableMissingMessageVerification       true
-     :wakuV2EnableStoreConfirmationForMessagesSent false
-     :previewPrivacy                               config/blank-preview?
-     :testNetworksEnabled                          config/test-networks-enabled?)))
+     (common-config)
+     {:deviceName          (native-module/get-installation-name)
+      :rootDataDir         (native-module/backup-disabled-data-dir)
+      :rootKeystoreDir     (native-module/keystore-dir)
+      :logLevel            (when log-enabled? config/log-level)
+      :logEnabled          log-enabled?
+      :logFilePath         (native-module/log-file-directory)
+      :wakuV2Fleet         config/fleet
+      :previewPrivacy      config/blank-preview?
+      :testNetworksEnabled config/test-networks-enabled?})))
 
 (defn strip-file-prefix
   [path]

diff --git a/src/status_im/contexts/profile/login/effects.cljs b/src/status_im/contexts/profile/login/effects.cljs
@@ -8,7 +8,10 @@
  (fn [[key-uid hashed-password]]
    ;;"node.login" signal will be triggered as a callback
    (native-module/login-account
-    (assoc (profile.config/login) :keyUid key-uid :password hashed-password))))
+    (assoc (merge (profile.config/login)
+                  (profile.config/fix-node-config-migration))
+           :keyUid   key-uid
+           :password hashed-password))))
 
 (rf/reg-fx :effects.profile/enable-local-notifications
  (fn []

diff --git a/status-go-version.json b/status-go-version.json
@@ -3,7 +3,7 @@
     "_comment": "Instead use: scripts/update-status-go.sh <rev>",
     "owner": "status-im",
     "repo": "status-go",
-    "version": "v9.1.0",
-    "commit-sha1": "4ec885a91f2857a30d1838213000f0a5a91fd52a",
-    "src-sha256": "1fkvhazv7v2vyqpffx3r4p3aii5ai464nx2pdfgn6b6gmb24bxdq"
+    "version": "fix/node_config_migration",
+    "commit-sha1": "d7f725f4cbb482fd28125f1f00677347dc0b16d6",
+    "src-sha256": "0mwnlhn77m1kg3wra51pvizf1m0rcvlynfb83jmyj981slrh2kll"
 }