Page MenuHomePhabricator
Differential D12170

[web][keyserver] Use entries from the initial state only if they are missing from the store
ClosedPublic
Actions

Authored by tomek on May 22 2024, 4:41 AM.
Tags
None
Referenced Files
Unknown Object (File)
Wed, Apr 9, 4:35 AM
Unknown Object (File)
Mon, Apr 7, 2:02 PM
Unknown Object (File)
Mon, Apr 7, 6:30 AM
Unknown Object (File)
Mon, Apr 7, 3:45 AM
Unknown Object (File)
Mon, Apr 7, 1:01 AM
Unknown Object (File)
Sun, Apr 6, 8:52 PM
Unknown Object (File)
Sun, Apr 6, 8:14 AM
Unknown Object (File)
Mar 12 2025, 11:32 AM
View All Files
Subscribers
ashoat

Details

Reviewers
kamil
marcin
Commits
rCOMM3248d0b99c58: [web][keyserver] Use entries from the initial state only if they are missing…
Summary

This is the last step of the migration - we should no longer use the values returned from the initial Redux state.

Depends on D12153

https://linear.app/comm/issue/ENG-3486/move-entrystore-to-sqlite

Test Plan

Closed and opened the app (both native and web) - the entries aren't sent from the keyserver so doing this verified if they are correctly persisted and rehydrated.

Diff Detail

Repository
rCOMM Comm
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Event Timeline

tomek created this revision.May 22 2024, 4:41 AM
Herald added a subscriber: ashoat. · View Herald TranscriptMay 22 2024, 4:41 AM
Harbormaster completed remote builds in B29155: Diff 40526.May 22 2024, 4:58 AM
tomek requested review of this revision.May 22 2024, 4:58 AM
tomek updated this revision to Diff 40527.May 22 2024, 4:58 AM

Use entries from the DB

tomek edited the test plan for this revision. (Show Details)May 22 2024, 5:01 AM
Harbormaster completed remote builds in B29156: Diff 40527.May 22 2024, 5:13 AM
tomek added a child revision: D12177: [lib] Stop checking for entry store inconsistencies.May 22 2024, 5:55 AM
marcin accepted this revision.May 22 2024, 7:17 AM
This revision is now accepted and ready to land.May 22 2024, 7:17 AM
marcin edited the test plan for this revision. (Show Details)May 22 2024, 7:17 AM
tomek added inline comments.May 27 2024, 5:15 AM
keyserver/src/responders/redux-state-responders.js
223 ↗(On Diff #40527)

We still should return this because we don't persist it on web

ashoat added inline comments.May 28 2024, 12:04 PM
keyserver/src/responders/redux-state-responders.js
223 ↗(On Diff #40527)

If it's always 0, is it something we can just insert automatically on the web side?

tomek added inline comments.May 29 2024, 1:49 AM
keyserver/src/responders/redux-state-responders.js
223 ↗(On Diff #40527)

Yes, that makes sense!

tomek added inline comments.Jul 23 2024, 3:41 AM
keyserver/src/responders/redux-state-responders.js
223 ↗(On Diff #40527)

We insert this value on the web automatically by having it in the defaultWebState. Here we still should return this value so that the finalEntryStorePromise returns Promise<EntryStore>.

tomek updated this revision to Diff 42678.Jul 23 2024, 3:52 AM

Rebase

Harbormaster completed remote builds in B30603: Diff 42678.Jul 23 2024, 4:14 AM
Closed by commit rCOMM3248d0b99c58: [web][keyserver] Use entries from the initial state only if they are missing… (authored by tomek). · Explain WhyJul 23 2024, 5:57 AM
This revision was automatically updated to reflect the committed changes.
tomek added a commit: rCOMM3248d0b99c58: [web][keyserver] Use entries from the initial state only if they are missing….

Revision Contents
Changeset List

PathSize
keyserver/
src/
responders/
13 lines
lib/
reducers/
2 lines
web/
redux/
20 lines
types/
2 lines

Diff 42688

View Options

keyserver/src/responders/redux-state-responders.js

Show First 20 Lines • Show All 72 Lines • ▼ Show 20 Lines "dependencies": {
"ethers": "^6.11.1", "ethers": "^6.11.1",
"expo": "47.0.14", "expo": "47.0.14",
"expo-application": "^5.1.1", "expo-application": "^5.1.1",
"expo-barcode-scanner": "~12.1.0", "expo-barcode-scanner": "~12.1.0",
"expo-dev-client": "~2.0.1", "expo-dev-client": "~2.0.1",
"expo-file-system": "~15.1.1", "expo-file-system": "~15.1.1",
"expo-font": "~11.0.1", "expo-font": "~11.0.1",
"expo-haptics": "~12.0.1", "expo-haptics": "~12.0.1",
"expo-image": "^1.2.2", "expo-image": "1.2.3",
"expo-image-manipulator": "~11.0.0", "expo-image-manipulator": "~11.0.0",
"expo-image-picker": "~14.0.2", "expo-image-picker": "~14.0.2",
"expo-media-library": "~15.0.0", "expo-media-library": "~15.0.0",
"expo-secure-store": "~12.0.0", "expo-secure-store": "~12.0.0",
"expo-splash-screen": "~0.17.4", "expo-splash-screen": "~0.17.4",
"find-root": "^1.1.0", "find-root": "^1.1.0",
"invariant": "^2.2.4", "invariant": "^2.2.4",
"lib": "0.0.1", "lib": "0.0.1",
"lodash": "^4.17.21", "lodash": "^4.17.21",
"lottie-react-native": "^5.1.4", "lottie-react-native": "^5.1.4",
"md5": "^2.2.1", "md5": "^2.2.1",
"olm": "git+https://github.com/CommE2E/olm.git#v0.2.1", "olm": "git+https://github.com/CommE2E/olm.git#v0.2.1",
"react": "18.1.0", "react": "18.1.0",
"react-native": "0.70.9", "react-native": "0.70.9",
"react-native-camera": "^3.31.0", "react-native-camera": "^3.31.0",
"react-native-device-info": "^10.3.0", "react-native-device-info": "^10.3.0",
"react-native-ffmpeg": "^0.4.4", "react-native-ffmpeg": "^0.5.2",
"react-native-figma-squircle": "^0.1.2", "react-native-figma-squircle": "^0.1.2",
"react-native-floating-action": "^1.22.0", "react-native-floating-action": "^1.22.0",
"react-native-fs": "^2.20.0", "react-native-fs": "^2.20.0",
"react-native-gesture-handler": "^2.8.0", "react-native-gesture-handler": "^2.8.0",
"react-native-in-app-message": "^1.0.2", "react-native-in-app-message": "^1.0.2",
"react-native-keyboard-input": "6.0.1", "react-native-keyboard-input": "6.0.1",
"react-native-keychain": "^8.0.0", "react-native-keychain": "^8.0.0",
"react-native-orientation-locker": "^1.5.0", "react-native-orientation-locker": "^1.5.0",
Show All 29 Lines
View Options

lib/reducers/entry-reducer.js

Show First 20 Lines • Show All 72 Lines • ▼ Show 20 Lines "dependencies": {
"ethers": "^6.11.1", "ethers": "^6.11.1",
"expo": "47.0.14", "expo": "47.0.14",
"expo-application": "^5.1.1", "expo-application": "^5.1.1",
"expo-barcode-scanner": "~12.1.0", "expo-barcode-scanner": "~12.1.0",
"expo-dev-client": "~2.0.1", "expo-dev-client": "~2.0.1",
"expo-file-system": "~15.1.1", "expo-file-system": "~15.1.1",
"expo-font": "~11.0.1", "expo-font": "~11.0.1",
"expo-haptics": "~12.0.1", "expo-haptics": "~12.0.1",
"expo-image": "^1.2.2", "expo-image": "1.2.3",
"expo-image-manipulator": "~11.0.0", "expo-image-manipulator": "~11.0.0",
"expo-image-picker": "~14.0.2", "expo-image-picker": "~14.0.2",
"expo-media-library": "~15.0.0", "expo-media-library": "~15.0.0",
"expo-secure-store": "~12.0.0", "expo-secure-store": "~12.0.0",
"expo-splash-screen": "~0.17.4", "expo-splash-screen": "~0.17.4",
"find-root": "^1.1.0", "find-root": "^1.1.0",
"invariant": "^2.2.4", "invariant": "^2.2.4",
"lib": "0.0.1", "lib": "0.0.1",
"lodash": "^4.17.21", "lodash": "^4.17.21",
"lottie-react-native": "^5.1.4", "lottie-react-native": "^5.1.4",
"md5": "^2.2.1", "md5": "^2.2.1",
"olm": "git+https://github.com/CommE2E/olm.git#v0.2.1", "olm": "git+https://github.com/CommE2E/olm.git#v0.2.1",
"react": "18.1.0", "react": "18.1.0",
"react-native": "0.70.9", "react-native": "0.70.9",
"react-native-camera": "^3.31.0", "react-native-camera": "^3.31.0",
"react-native-device-info": "^10.3.0", "react-native-device-info": "^10.3.0",
"react-native-ffmpeg": "^0.4.4", "react-native-ffmpeg": "^0.5.2",
"react-native-figma-squircle": "^0.1.2", "react-native-figma-squircle": "^0.1.2",
"react-native-floating-action": "^1.22.0", "react-native-floating-action": "^1.22.0",
"react-native-fs": "^2.20.0", "react-native-fs": "^2.20.0",
"react-native-gesture-handler": "^2.8.0", "react-native-gesture-handler": "^2.8.0",
"react-native-in-app-message": "^1.0.2", "react-native-in-app-message": "^1.0.2",
"react-native-keyboard-input": "6.0.1", "react-native-keyboard-input": "6.0.1",
"react-native-keychain": "^8.0.0", "react-native-keychain": "^8.0.0",
"react-native-orientation-locker": "^1.5.0", "react-native-orientation-locker": "^1.5.0",
Show All 29 Lines
View Options

web/redux/initial-state-gate.js

Show First 20 Lines • Show All 72 Lines • ▼ Show 20 Lines "dependencies": {
"ethers": "^6.11.1", "ethers": "^6.11.1",
"expo": "47.0.14", "expo": "47.0.14",
"expo-application": "^5.1.1", "expo-application": "^5.1.1",
"expo-barcode-scanner": "~12.1.0", "expo-barcode-scanner": "~12.1.0",
"expo-dev-client": "~2.0.1", "expo-dev-client": "~2.0.1",
"expo-file-system": "~15.1.1", "expo-file-system": "~15.1.1",
"expo-font": "~11.0.1", "expo-font": "~11.0.1",
"expo-haptics": "~12.0.1", "expo-haptics": "~12.0.1",
"expo-image": "^1.2.2", "expo-image": "1.2.3",
"expo-image-manipulator": "~11.0.0", "expo-image-manipulator": "~11.0.0",
"expo-image-picker": "~14.0.2", "expo-image-picker": "~14.0.2",
"expo-media-library": "~15.0.0", "expo-media-library": "~15.0.0",
"expo-secure-store": "~12.0.0", "expo-secure-store": "~12.0.0",
"expo-splash-screen": "~0.17.4", "expo-splash-screen": "~0.17.4",
"find-root": "^1.1.0", "find-root": "^1.1.0",
"invariant": "^2.2.4", "invariant": "^2.2.4",
"lib": "0.0.1", "lib": "0.0.1",
"lodash": "^4.17.21", "lodash": "^4.17.21",
"lottie-react-native": "^5.1.4", "lottie-react-native": "^5.1.4",
"md5": "^2.2.1", "md5": "^2.2.1",
"olm": "git+https://github.com/CommE2E/olm.git#v0.2.1", "olm": "git+https://github.com/CommE2E/olm.git#v0.2.1",
"react": "18.1.0", "react": "18.1.0",
"react-native": "0.70.9", "react-native": "0.70.9",
"react-native-camera": "^3.31.0", "react-native-camera": "^3.31.0",
"react-native-device-info": "^10.3.0", "react-native-device-info": "^10.3.0",
"react-native-ffmpeg": "^0.4.4", "react-native-ffmpeg": "^0.5.2",
"react-native-figma-squircle": "^0.1.2", "react-native-figma-squircle": "^0.1.2",
"react-native-floating-action": "^1.22.0", "react-native-floating-action": "^1.22.0",
"react-native-fs": "^2.20.0", "react-native-fs": "^2.20.0",
"react-native-gesture-handler": "^2.8.0", "react-native-gesture-handler": "^2.8.0",
"react-native-in-app-message": "^1.0.2", "react-native-in-app-message": "^1.0.2",
"react-native-keyboard-input": "6.0.1", "react-native-keyboard-input": "6.0.1",
"react-native-keychain": "^8.0.0", "react-native-keychain": "^8.0.0",
"react-native-orientation-locker": "^1.5.0", "react-native-orientation-locker": "^1.5.0",
Show All 29 Lines
View Options

web/types/redux-types.js

Show First 20 Lines • Show All 72 Lines • ▼ Show 20 Lines "dependencies": {
"ethers": "^6.11.1", "ethers": "^6.11.1",
"expo": "47.0.14", "expo": "47.0.14",
"expo-application": "^5.1.1", "expo-application": "^5.1.1",
"expo-barcode-scanner": "~12.1.0", "expo-barcode-scanner": "~12.1.0",
"expo-dev-client": "~2.0.1", "expo-dev-client": "~2.0.1",
"expo-file-system": "~15.1.1", "expo-file-system": "~15.1.1",
"expo-font": "~11.0.1", "expo-font": "~11.0.1",
"expo-haptics": "~12.0.1", "expo-haptics": "~12.0.1",
"expo-image": "^1.2.2", "expo-image": "1.2.3",
"expo-image-manipulator": "~11.0.0", "expo-image-manipulator": "~11.0.0",
"expo-image-picker": "~14.0.2", "expo-image-picker": "~14.0.2",
"expo-media-library": "~15.0.0", "expo-media-library": "~15.0.0",
"expo-secure-store": "~12.0.0", "expo-secure-store": "~12.0.0",
"expo-splash-screen": "~0.17.4", "expo-splash-screen": "~0.17.4",
"find-root": "^1.1.0", "find-root": "^1.1.0",
"invariant": "^2.2.4", "invariant": "^2.2.4",
"lib": "0.0.1", "lib": "0.0.1",
"lodash": "^4.17.21", "lodash": "^4.17.21",
"lottie-react-native": "^5.1.4", "lottie-react-native": "^5.1.4",
"md5": "^2.2.1", "md5": "^2.2.1",
"olm": "git+https://github.com/CommE2E/olm.git#v0.2.1", "olm": "git+https://github.com/CommE2E/olm.git#v0.2.1",
"react": "18.1.0", "react": "18.1.0",
"react-native": "0.70.9", "react-native": "0.70.9",
"react-native-camera": "^3.31.0", "react-native-camera": "^3.31.0",
"react-native-device-info": "^10.3.0", "react-native-device-info": "^10.3.0",
"react-native-ffmpeg": "^0.4.4", "react-native-ffmpeg": "^0.5.2",
"react-native-figma-squircle": "^0.1.2", "react-native-figma-squircle": "^0.1.2",
"react-native-floating-action": "^1.22.0", "react-native-floating-action": "^1.22.0",
"react-native-fs": "^2.20.0", "react-native-fs": "^2.20.0",
"react-native-gesture-handler": "^2.8.0", "react-native-gesture-handler": "^2.8.0",
"react-native-in-app-message": "^1.0.2", "react-native-in-app-message": "^1.0.2",
"react-native-keyboard-input": "6.0.1", "react-native-keyboard-input": "6.0.1",
"react-native-keychain": "^8.0.0", "react-native-keychain": "^8.0.0",
"react-native-orientation-locker": "^1.5.0", "react-native-orientation-locker": "^1.5.0",
Show All 29 Lines