Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Cw 462 monero polyseed restore support #1109

Merged
merged 29 commits into from
Nov 25, 2023
Merged

Cw 462 monero polyseed restore support #1109

merged 29 commits into from
Nov 25, 2023

Conversation

konstantinullrich
Copy link
Contributor

@konstantinullrich konstantinullrich commented Oct 2, 2023 •
edited
Loading

Description

Add Polyseed to restore a Monero Wallet

Requires Monero PR-3 and Monero PR-4

Pull Request - Checklist

  • Initial Manual Tests Passed
  • Double check modified code and verify it with the feature/task requirements
  • Format code
  • Look for code duplication
  • Clear naming for variables and methods

@konstantinullrich
CW-462 Mark Places to integrate Polyseed
61d5018
@konstantinullrich
CW-462 Add Restore from Polyseed
498b745
@konstantinullrich
CW-462 Add Restore from Polyseed
31c7af8
@konstantinullrich
CW-462 Add new Monero date-height pairs
a3784fd
@konstantinullrich
CW-462 Little Cleanup
fe66b94
@konstantinullrich
CW-462 Ups I missed that Debug line :/
3ed467b
@konstantinullrich
CW-462 Fix Polyseed not showing in Wallet-Seed/Keys Page
df31bd8
@konstantinullrich
CW-462 Prepare for Wallet creation
9da604a
@konstantinullrich
Merge branch 'main' into CW-462-Monero-polyseed-restore-support
a4cfbd5 
# Conflicts:
#	res/values/strings_ar.arb
#	res/values/strings_bg.arb
#	res/values/strings_cs.arb
#	res/values/strings_de.arb
#	res/values/strings_en.arb
#	res/values/strings_es.arb
#	res/values/strings_fr.arb
#	res/values/strings_ha.arb
#	res/values/strings_hi.arb
#	res/values/strings_hr.arb
#	res/values/strings_id.arb
#	res/values/strings_it.arb
#	res/values/strings_ja.arb
#	res/values/strings_ko.arb
#	res/values/strings_my.arb
#	res/values/strings_nl.arb
#	res/values/strings_pl.arb
#	res/values/strings_pt.arb
#	res/values/strings_ru.arb
#	res/values/strings_th.arb
#	res/values/strings_tr.arb
#	res/values/strings_uk.arb
#	res/values/strings_ur.arb
#	res/values/strings_yo.arb
#	res/values/strings_zh.arb
@konstantinullrich
CW-462 Fix merge conflict
9081924
@konstantinullrich
CW-462 Fix generating monero.dart
f9b5d8f
@konstantinullrich
Merge branch 'main' into CW-462-Monero-polyseed-restore-support
a702d32
@konstantinullrich
Merge branch 'main' into CW-462-Monero-polyseed-restore-support
f8c3522
@konstantinullrich
CW-462 Add Polyseed generation
875fbd6
@konstantinullrich konstantinullrich marked this pull request as ready for review October 9, 2023 12:02
@konstantinullrich
CW-462 Add Polyseed Languages to SeedLanguagePicker
9d236b7
@konstantinullrich
Merge branch 'main' into CW-462-Monero-polyseed-restore-support
bf2376d
@konstantinullrich
Merge branch 'main' into CW-462-Monero-polyseed-restore-support
8bd041d 
# Conflicts:
#	lib/store/settings_store.dart
#	lib/view_model/wallet_new_vm.dart
#	res/values/strings_ar.arb
#	res/values/strings_bg.arb
#	res/values/strings_cs.arb
#	res/values/strings_de.arb
#	res/values/strings_en.arb
#	res/values/strings_es.arb
#	res/values/strings_fr.arb
#	res/values/strings_ha.arb
#	res/values/strings_hi.arb
#	res/values/strings_hr.arb
#	res/values/strings_id.arb
#	res/values/strings_it.arb
#	res/values/strings_ja.arb
#	res/values/strings_ko.arb
#	res/values/strings_my.arb
#	res/values/strings_nl.arb
#	res/values/strings_pl.arb
#	res/values/strings_pt.arb
#	res/values/strings_ru.arb
#	res/values/strings_th.arb
#	res/values/strings_tl.arb
#	res/values/strings_tr.arb
#	res/values/strings_uk.arb
#	res/values/strings_ur.arb
#	res/values/strings_yo.arb
#	res/values/strings_zh.arb
@konstantinullrich
CW-462 Apply requested changes
1416172
@konstantinullrich
Merge branch 'main' into CW-462-Monero-polyseed-restore-support
0004544 
# Conflicts:
#	lib/monero/cw_monero.dart
#	lib/store/settings_store.dart
#	pubspec_base.yaml
#	res/values/strings_ar.arb
#	res/values/strings_bg.arb
#	res/values/strings_cs.arb
#	res/values/strings_de.arb
#	res/values/strings_en.arb
#	res/values/strings_es.arb
#	res/values/strings_fr.arb
#	res/values/strings_ha.arb
#	res/values/strings_hi.arb
#	res/values/strings_hr.arb
#	res/values/strings_id.arb
#	res/values/strings_it.arb
#	res/values/strings_ja.arb
#	res/values/strings_ko.arb
#	res/values/strings_my.arb
#	res/values/strings_nl.arb
#	res/values/strings_pl.arb
#	res/values/strings_pt.arb
#	res/values/strings_ru.arb
#	res/values/strings_th.arb
#	res/values/strings_tl.arb
#	res/values/strings_tr.arb
#	res/values/strings_uk.arb
#	res/values/strings_ur.arb
#	res/values/strings_yo.arb
#	res/values/strings_zh.arb
@konstantinullrich
CW-462 Minor bug fixes in restore screen
29e005e
@konstantinullrich
Update wallet_restore_from_seed_form.dart
cdde686
@konstantinullrich
CW-462 Minor Bugfix
0415cdc
@konstantinullrich
Merge branch 'main' into CW-462-Monero-polyseed-restore-support
bf8f307 
# Conflicts:
#	lib/src/screens/new_wallet/advanced_privacy_settings_page.dart
#	lib/store/settings_store.dart
#	lib/view_model/advanced_privacy_settings_view_model.dart
#	res/values/strings_ar.arb
#	res/values/strings_bg.arb
#	res/values/strings_cs.arb
#	res/values/strings_de.arb
#	res/values/strings_en.arb
#	res/values/strings_es.arb
#	res/values/strings_fr.arb
#	res/values/strings_ha.arb
#	res/values/strings_hi.arb
#	res/values/strings_hr.arb
#	res/values/strings_id.arb
#	res/values/strings_it.arb
#	res/values/strings_ja.arb
#	res/values/strings_ko.arb
#	res/values/strings_my.arb
#	res/values/strings_nl.arb
#	res/values/strings_pl.arb
#	res/values/strings_pt.arb
#	res/values/strings_ru.arb
#	res/values/strings_th.arb
#	res/values/strings_tl.arb
#	res/values/strings_tr.arb
#	res/values/strings_uk.arb
#	res/values/strings_ur.arb
#	res/values/strings_yo.arb
#	res/values/strings_zh.arb
@konstantinullrich
CW-462 Fix Restore from QR for Polyseeds
529364c
@konstantinullrich
Merge branch 'main' into CW-462-Monero-polyseed-restore-support
d0abbe5 
# Conflicts:
#	lib/store/settings_store.dart
#	pubspec_base.yaml
#	res/values/strings_ar.arb
#	res/values/strings_bg.arb
#	res/values/strings_cs.arb
#	res/values/strings_de.arb
#	res/values/strings_en.arb
#	res/values/strings_es.arb
#	res/values/strings_fr.arb
#	res/values/strings_ha.arb
#	res/values/strings_hi.arb
#	res/values/strings_hr.arb
#	res/values/strings_id.arb
#	res/values/strings_it.arb
#	res/values/strings_ja.arb
#	res/values/strings_ko.arb
#	res/values/strings_my.arb
#	res/values/strings_nl.arb
#	res/values/strings_pl.arb
#	res/values/strings_pt.arb
#	res/values/strings_ru.arb
#	res/values/strings_th.arb
#	res/values/strings_tl.arb
#	res/values/strings_tr.arb
#	res/values/strings_uk.arb
#	res/values/strings_ur.arb
#	res/values/strings_yo.arb
#	res/values/strings_zh.arb
@konstantinullrich
CW-462 Fix null-check-operator exception for Polyseeds and minor inco…
b28c5c7 
…nveniences
@konstantinullrich
CW-462 Fix minor inconveniences
9b54e8a
OmarHatem28
OmarHatem28 reviewed Nov 24, 2023
View reviewed changes
@OmarHatem28
Merge branch 'main' of https://github.com/cake-tech/cake_wallet into …
b3055a8 
…CW-462-Monero-polyseed-restore-support

� Conflicts:
�	pubspec_base.yaml
�	res/values/strings_ar.arb
�	res/values/strings_bg.arb
�	res/values/strings_cs.arb
�	res/values/strings_de.arb
�	res/values/strings_en.arb
�	res/values/strings_es.arb
�	res/values/strings_fr.arb
�	res/values/strings_ha.arb
�	res/values/strings_hi.arb
�	res/values/strings_hr.arb
�	res/values/strings_id.arb
�	res/values/strings_it.arb
�	res/values/strings_ja.arb
�	res/values/strings_ko.arb
�	res/values/strings_my.arb
�	res/values/strings_nl.arb
�	res/values/strings_pl.arb
�	res/values/strings_pt.arb
�	res/values/strings_ru.arb
�	res/values/strings_th.arb
�	res/values/strings_tl.arb
�	res/values/strings_tr.arb
�	res/values/strings_uk.arb
�	res/values/strings_ur.arb
�	res/values/strings_yo.arb
�	res/values/strings_zh.arb
@OmarHatem28
Fix conflicts and review comments and wrap unspent issue with try and…
4251f4c 
… catch with reporting failure
@OmarHatem28 OmarHatem28 merged commit 00c97c7 into main Nov 25, 2023
@OmarHatem28 OmarHatem28 deleted the CW-462-Monero-polyseed-restore-support branch November 25, 2023 00:37
This was referenced Nov 26, 2023
Open
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@OmarHatem28 OmarHatem28 OmarHatem28 approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@konstantinullrich @OmarHatem28