Skip to content

Commit

Permalink
fix_: bad node config migration
Browse files Browse the repository at this point in the history
  • Loading branch information
qfrank committed Jan 20, 2025
1 parent 174e44c commit 70768b6
Show file tree
Hide file tree
Showing 5 changed files with 21 additions and 6 deletions.
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.32.0
2.32.21952
3 changes: 2 additions & 1 deletion src/status_im/contexts/keycard/effects.cljs
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,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))))
Expand Down
11 changes: 11 additions & 0 deletions src/status_im/contexts/profile/config.cljs
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,17 @@
:alchemyArbitrumMainnetToken config/ALCHEMY_ARBITRUM_MAINNET_TOKEN
:alchemyArbitrumSepoliaToken config/ALCHEMY_ARBITRUM_SEPOLIA_TOKEN})

(defn fix-node-config-migration
[]
{: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 create
[]
(let [log-enabled? (boolean (not-empty config/log-level))]
Expand Down
5 changes: 4 additions & 1 deletion src/status_im/contexts/profile/login/effects.cljs
Original file line number Diff line number Diff line change
Expand Up @@ -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 []
Expand Down
6 changes: 3 additions & 3 deletions status-go-version.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"_comment": "Instead use: scripts/update-status-go.sh <rev>",
"owner": "status-im",
"repo": "status-go",
"version": "v8.1.0",
"commit-sha1": "df1c8788e42784ba3b8ed3e7c5bd3ea530028410",
"src-sha256": "1yxcswrj7p1m96lx795vbqlgjlmpkgzaw7l8f2k4ni3d7vmlklnw"
"version": "fix/node_config_migration",
"commit-sha1": "8a439b461cb6054f50f373238b2fe48f7ef63990",
"src-sha256": "081xqx6jz5fs6yikrwpvf92na429facd1dy80asbba0gp39gb2jk"
}

0 comments on commit 70768b6

Please sign in to comment.