Refactor wallet store #317

ashchan · 2019-05-10T15:51:46Z

Remove electron-store and refactor wallet store to separate its main wallet list file and keystore files for each wallet.

Breaking Notice

It will not load your existing data!!!

backend with your own Store impl

Keith-CY · 2019-05-10T18:01:59Z

CI failed

Two similar objects are unnecessary.

by introducing WalletProperties interface

ashchan · 2019-05-11T16:03:53Z

Resolving conflicts...

Note: this breaks wallet name uniquness check on creating new one.

classicalliu · 2019-05-12T03:07:18Z

packages/neuron-wallet/src/services/wallets.ts

+}
+
+// TODO: Check if '/dev/wallets' path works on Windows
+const defaultStorePath = env.isDevMode ? '/dev/wallets' : '/wallets'


maybe can use path

Keith-CY · 2019-05-12T03:24:42Z

packages/neuron-wallet/src/services/wallets.ts

+  private currentWalletKey = 'current'
+
+  constructor(storePath: string = defaultStorePath) {
+    this.storePath = `${app.getPath('userData')}/${storePath}`


use path.join

Keith-CY · 2019-05-12T03:28:54Z

packages/neuron-wallet/src/services/wallets.ts

-    const id = v4()
-    walletStore.saveWallet({ id, name, keystore, addresses })
-    return { id, name, keystore, addresses }
+    return undefined


better to use null which explicitly means none

Makes sense. Doing that in a future refactoring.

Keith-CY · 2019-05-12T03:29:32Z

packages/neuron-wallet/src/services/wallets.ts

+    if (walletId) {
+      return this.get(walletId)
+    }
+    return undefined


better to use null

Keith-CY · 2019-05-12T03:38:00Z

conflicts

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* chore(deps): update dependency lerna to v7.4.2 (#314) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * chore(deps): update dependency jest-when to v3.6.0 (#313) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * chore(deps): update dependency jest-styled-components to v7.2.0 (#312) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * fix(deps): update dependency @ckb-lumos/bi to v0.21.0-next.3 (#317) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * chore(deps): update dependency eslint-plugin-import to v2.29.0 (#309) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * fix(deps): update dependency @ckb-lumos/codec to v0.21.0-next.3 (#319) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * fix(deps): update dependency @ckb-lumos/hd to v0.21.0-next.3 (#322) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * fix(deps): update dependency @ckb-lumos/common-scripts to v0.21.0-next.3 (#320) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * fix(deps): update dependency @ckb-lumos/ckb-indexer to v0.21.0-next.3 (#318) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * fix(deps): update dependency @ckb-lumos/config-manager to v0.21.0-next.3 (#321) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * chore(deps): update dependency react-i18next to v13.5.0 (#325) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * chore(deps): update dependency @babel/core to v7.23.5 (#327) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * chore(deps): update dependency typescript to v5.3.3 * chore(deps): update dependency @types/enzyme to v3.10.18 (#328) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * chore: update reviewers of renovate (#330) * refactor: introduce tslib --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* chore(deps): update dependency lerna to v7.4.2 (#314) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * chore(deps): update dependency jest-when to v3.6.0 (#313) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * chore(deps): update dependency jest-styled-components to v7.2.0 (#312) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * fix(deps): update dependency @ckb-lumos/bi to v0.21.0-next.3 (#317) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * chore(deps): update dependency eslint-plugin-import to v2.29.0 (#309) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * fix(deps): update dependency @ckb-lumos/codec to v0.21.0-next.3 (#319) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * fix(deps): update dependency @ckb-lumos/hd to v0.21.0-next.3 (#322) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * fix(deps): update dependency @ckb-lumos/common-scripts to v0.21.0-next.3 (#320) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * fix(deps): update dependency @ckb-lumos/ckb-indexer to v0.21.0-next.3 (#318) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * fix(deps): update dependency @ckb-lumos/config-manager to v0.21.0-next.3 (#321) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * chore(deps): update dependency react-i18next to v13.5.0 (#325) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * chore(deps): update dependency @babel/core to v7.23.5 (#327) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * chore(deps): update dependency typescript to v5.3.3 * chore(deps): update dependency @types/enzyme to v3.10.18 (#328) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * chore: update reviewers of renovate (#330) * chore(deps): update dependency @babel/core to v7.23.6 * chore(deps): update dependency eslint-plugin-import to v2.29.1 * refactor: introduce tslib * chore(deps): update dependency eslint to v8.56.0 * chore(deps): update react monorepo to v18 * chore(deps): update dependency wait-on to v7.2.0 * chore(deps): update dependency webpack to v5.89.0 * chore(deps): update dependency @types/styled-components to v5.1.34 * chore(deps): update node.js to v18.19.0 * refactor: update type declaration for react 18 * chore(deps): update peterjgrainger/action-create-branch action to v2.4.0 * chore(deps): update typescript-eslint monorepo to v5.62.0 * fix(deps): update dependency react-router-dom to v6.21.0 * fix(deps): update dependency sass to v1.69.5 * fix(deps): update dependency undici to v5.28.2 * chore(deps): update storybook monorepo to v7.6.6 (#342) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * chore(deps): update actions/checkout action to v4 (#349) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * chore(deps): update actions/github-script action to v7 (#350) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * chore(deps): update dependency react-i18next to v12.3.1 * chore(deps): update actions/setup-node action to v4 * chore(deps): update actions/stale action to v9 * chore(deps): update actions/upload-artifact action to v4 * chore(deps): update crazy-max/ghaction-import-gpg action to v6 (#355) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * chore: rollback wait-on because it hangs in tcp connection --------- Signed-off-by: Chen Yu <[email protected]> Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* chore(deps): update dependency lerna to v7.4.2 (nervosnetwork#314) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * chore(deps): update dependency jest-when to v3.6.0 (nervosnetwork#313) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * chore(deps): update dependency jest-styled-components to v7.2.0 (nervosnetwork#312) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * fix(deps): update dependency @ckb-lumos/bi to v0.21.0-next.3 (nervosnetwork#317) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * chore(deps): update dependency eslint-plugin-import to v2.29.0 (nervosnetwork#309) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * fix(deps): update dependency @ckb-lumos/codec to v0.21.0-next.3 (nervosnetwork#319) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * fix(deps): update dependency @ckb-lumos/hd to v0.21.0-next.3 (nervosnetwork#322) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * fix(deps): update dependency @ckb-lumos/common-scripts to v0.21.0-next.3 (nervosnetwork#320) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * fix(deps): update dependency @ckb-lumos/ckb-indexer to v0.21.0-next.3 (nervosnetwork#318) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * fix(deps): update dependency @ckb-lumos/config-manager to v0.21.0-next.3 (nervosnetwork#321) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * chore(deps): update dependency react-i18next to v13.5.0 (nervosnetwork#325) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * chore(deps): update dependency @babel/core to v7.23.5 (nervosnetwork#327) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * chore(deps): update dependency typescript to v5.3.3 * chore(deps): update dependency @types/enzyme to v3.10.18 (nervosnetwork#328) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * chore: update reviewers of renovate (nervosnetwork#330) * refactor: introduce tslib --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* chore(deps): update dependency lerna to v7.4.2 (nervosnetwork#314) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * chore(deps): update dependency jest-when to v3.6.0 (nervosnetwork#313) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * chore(deps): update dependency jest-styled-components to v7.2.0 (nervosnetwork#312) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * fix(deps): update dependency @ckb-lumos/bi to v0.21.0-next.3 (nervosnetwork#317) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * chore(deps): update dependency eslint-plugin-import to v2.29.0 (nervosnetwork#309) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * fix(deps): update dependency @ckb-lumos/codec to v0.21.0-next.3 (nervosnetwork#319) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * fix(deps): update dependency @ckb-lumos/hd to v0.21.0-next.3 (nervosnetwork#322) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * fix(deps): update dependency @ckb-lumos/common-scripts to v0.21.0-next.3 (nervosnetwork#320) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * fix(deps): update dependency @ckb-lumos/ckb-indexer to v0.21.0-next.3 (nervosnetwork#318) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * fix(deps): update dependency @ckb-lumos/config-manager to v0.21.0-next.3 (nervosnetwork#321) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * chore(deps): update dependency react-i18next to v13.5.0 (nervosnetwork#325) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * chore(deps): update dependency @babel/core to v7.23.5 (nervosnetwork#327) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * chore(deps): update dependency typescript to v5.3.3 * chore(deps): update dependency @types/enzyme to v3.10.18 (nervosnetwork#328) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * chore: update reviewers of renovate (nervosnetwork#330) * chore(deps): update dependency @babel/core to v7.23.6 * chore(deps): update dependency eslint-plugin-import to v2.29.1 * refactor: introduce tslib * chore(deps): update dependency eslint to v8.56.0 * chore(deps): update react monorepo to v18 * chore(deps): update dependency wait-on to v7.2.0 * chore(deps): update dependency webpack to v5.89.0 * chore(deps): update dependency @types/styled-components to v5.1.34 * chore(deps): update node.js to v18.19.0 * refactor: update type declaration for react 18 * chore(deps): update peterjgrainger/action-create-branch action to v2.4.0 * chore(deps): update typescript-eslint monorepo to v5.62.0 * fix(deps): update dependency react-router-dom to v6.21.0 * fix(deps): update dependency sass to v1.69.5 * fix(deps): update dependency undici to v5.28.2 * chore(deps): update storybook monorepo to v7.6.6 (nervosnetwork#342) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * chore(deps): update actions/checkout action to v4 (nervosnetwork#349) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * chore(deps): update actions/github-script action to v7 (nervosnetwork#350) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * chore(deps): update dependency react-i18next to v12.3.1 * chore(deps): update actions/setup-node action to v4 * chore(deps): update actions/stale action to v9 * chore(deps): update actions/upload-artifact action to v4 * chore(deps): update crazy-max/ghaction-import-gpg action to v6 (nervosnetwork#355) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * chore: rollback wait-on because it hangs in tcp connection --------- Signed-off-by: Chen Yu <[email protected]> Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

chore: Allow no blank line between class single line members

2cc95d0

ashchan self-assigned this May 10, 2019

ashchan added 2 commits May 11, 2019 02:34

refactor: Replace WalletStore's underlying electron-store

2b0c0c4

backend with your own Store impl

chore(deps): Remove electron-store

42dea2c

ashchan added 5 commits May 11, 2019 14:17

refactor: Rename WalletData to Wallet

e9ab0bb

refactor: Alias uuid.v4() as uuid()

b0396ad

refactor: Combine WalletStore into WalletService

9413146

Two similar objects are unnecessary.

refactor: Limit the data fields that can be modified on a wallet

9d06bd7

by introducing WalletProperties interface

refactor: Separate keystore files from wallet list store

2cc1348

ashchan marked this pull request as ready for review May 11, 2019 15:55

ashchan requested review from Keith-CY and classicalliu May 11, 2019 15:55

Merge origin/develop resolving conflicts

12e3cd5

Note: this breaks wallet name uniquness check on creating new one.

ashchan requested a review from duanyytop May 11, 2019 16:07

classicalliu approved these changes May 12, 2019

View reviewed changes

Keith-CY reviewed May 12, 2019

View reviewed changes

chore: Merge origin/develop

1a5e093

ashchan merged commit a00dfac into develop May 12, 2019

Keith-CY deleted the refactor-wallet-store branch May 23, 2019 08:02

Keith-CY pushed a commit that referenced this pull request Dec 10, 2023

fix(deps): update dependency @ckb-lumos/bi to v0.21.0-next.3 (#317)

89d58c3

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Refactor wallet store #317

Refactor wallet store #317

ashchan commented May 10, 2019 •

edited

Loading

Keith-CY commented May 10, 2019

ashchan commented May 11, 2019

classicalliu May 12, 2019

Keith-CY May 12, 2019

Keith-CY May 12, 2019

ashchan May 12, 2019

Keith-CY May 12, 2019

Keith-CY commented May 12, 2019

Refactor wallet store #317

Refactor wallet store #317

Conversation

ashchan commented May 10, 2019 • edited Loading

Breaking Notice

Keith-CY commented May 10, 2019

ashchan commented May 11, 2019

classicalliu May 12, 2019

Choose a reason for hiding this comment

Keith-CY May 12, 2019

Choose a reason for hiding this comment

Keith-CY May 12, 2019

Choose a reason for hiding this comment

ashchan May 12, 2019

Choose a reason for hiding this comment

Keith-CY May 12, 2019

Choose a reason for hiding this comment

Keith-CY commented May 12, 2019

ashchan commented May 10, 2019 •

edited

Loading