add debug

JustinBeBoy · May 23, 2024 · 5bfcb2b · 5bfcb2b
1 parent a9aee92
commit 5bfcb2b
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 9 deletions.
diff --git a/libwallet/assets/wallet/wallet_utils.go b/libwallet/assets/wallet/wallet_utils.go
@@ -222,6 +222,7 @@ func VerifyMnemonic(seedMnemonic string, assetType utils.AssetType, seedType Wor
 }
 
 func DecodeSeedMnemonic(seedMnemonic string, assetType utils.AssetType, seedType WordSeedType) (hashedSeed []byte, err error) {
+	seedMnemonic = strings.TrimSpace(seedMnemonic)
 	switch assetType {
 	case utils.BTCWalletAsset, utils.DCRWalletAsset, utils.LTCWalletAsset:
 		words := strings.Split(strings.TrimSpace(seedMnemonic), " ")
@@ -237,12 +238,13 @@ func DecodeSeedMnemonic(seedMnemonic string, assetType utils.AssetType, seedType
 				return nil, err
 			}
 		}
-
 		// seedMnemonic is list of words
 		if seedType == WordSeed33 {
 			hashedSeed, err = walletseed.DecodeUserInput(seedMnemonic)
 		} else {
+			fmt.Println("-------DecodeSeedMnemonic-----22222--->", seedMnemonic)
 			hashedSeed, err = bip39.NewSeedWithErrorChecking(seedMnemonic, "")
+			fmt.Println("------DecodeSeedMnemonic--22222--->", err)
 		}
 	default:
 		err = fmt.Errorf("%v: (%v)", utils.ErrAssetUnknown, assetType)

diff --git a/libwallet/dcr.go b/libwallet/dcr.go
@@ -2,6 +2,7 @@ package libwallet
 
 import (
 	"context"
+	"fmt"
 
 	"decred.org/dcrwallet/v3/errors"
 	"decred.org/dcrwallet/v3/walletseed"
@@ -155,10 +156,13 @@ func (mgr *AssetsManager) DCRWalletWithSeed(seedMnemonic string, wordSeedType sh
 func deriveBIP44AccountXPubsForDCR(seedMnemonic string, wordSeedType sharedW.WordSeedType, account uint32, params *chaincfg.Params) (string, string, error) {
 	var seed []byte
 	var err error
+	fmt.Println("-------deriveBIP44AccountXPubsForDCR-----wordSeedType--->", wordSeedType)
 	if wordSeedType == sharedW.WordSeed33 {
 		seed, err = walletseed.DecodeUserInput(seedMnemonic)
 	} else {
+		fmt.Println("-------deriveBIP44AccountXPubsForDCR-----seed--->", seedMnemonic)
 		seed, err = bip39.NewSeedWithErrorChecking(seedMnemonic, "")
+		fmt.Println("-------deriveBIP44AccountXPubsForDCR-----err--->", err)
 	}
 	if err != nil {
 		return "", "", err

diff --git a/ui/page/components/restore_page.go b/ui/page/components/restore_page.go
@@ -288,6 +288,8 @@ func (pg *Restore) restoreFromSeedEditor() {
 		pg.seedInputEditor.Editor.SetText("")
 	}
 
+	fmt.Println("--restoreFromSeedEditor--------------->")
+
 	seedOrHex := strings.TrimSpace(pg.seedInputEditor.Editor.Text())
 	// Check if the user did input a hex or seed. If its a hex set the correct tabindex.
 	if len(seedOrHex) > MaxSeedBytes {
@@ -310,6 +312,7 @@ func (pg *Restore) restoreFromSeedEditor() {
 	}
 
 	if !sharedW.VerifyMnemonic(seedOrHex, pg.walletType, wordSeedType) {
+		fmt.Println("--sharedW.VerifyMnemonic----->", seedOrHex)
 		errMsg := values.String(values.StrInvalidHex)
 		if pg.tabIndex == 0 {
 			errMsg = values.String(values.StrInvalidSeedPhrase)
@@ -320,7 +323,10 @@ func (pg *Restore) restoreFromSeedEditor() {
 		return
 	}
 
-	walletWithSameSeed, err := pg.AssetsManager.WalletWithSeed(pg.walletType, seedOrHex, pg.getWordSeedType())
+	fmt.Println("--aaaaaaaaaaaaaaaaaaaa----->")
+
+	walletWithSameSeed, err := pg.AssetsManager.WalletWithSeed(pg.walletType, seedOrHex, wordSeedType)
+	fmt.Println("---errerrerrerrerr----->", err)
 	if err != nil {
 		log.Error(err)
 		errMsg := values.String(values.StrInvalidHex)

diff --git a/ui/page/components/seed_restore_page.go b/ui/page/components/seed_restore_page.go
@@ -54,9 +54,9 @@ type SeedRestore struct {
 	optionsMenuCard cryptomaterial.Card
 	window          app.WindowNavigator
 
-	suggestions    []string
-	allSuggestions []string
-	seedMenu       []seedItemMenu
+	suggestions []string
+	// allSuggestions []string
+	seedMenu []seedItemMenu
 
 	seedPhrase string
 	walletName string
@@ -110,7 +110,7 @@ func NewSeedRestorePage(l *load.Load, walletName string, walletType libutils.Ass
 	pg.initSeedMenu()
 
 	// set suggestions
-	pg.allSuggestions = getWordSeedType().AllWords()
+	// pg.allSuggestions = getWordSeedType().AllWords()
 
 	return pg
 }
@@ -407,7 +407,7 @@ func (pg SeedRestore) suggestionSeeds(text string) []string {
 		return seeds
 	}
 
-	for _, word := range pg.allSuggestions {
+	for _, word := range pg.getWordSeedType().AllWords() {
 		if strings.HasPrefix(strings.ToLower(word), strings.ToLower(text)) {
 			if len(seeds) < pg.suggestionLimit {
 				seeds = append(seeds, word)
@@ -426,7 +426,7 @@ func (pg *SeedRestore) updateSeedResetBtn() bool {
 
 func (pg *SeedRestore) validateSeeds() (bool, string) {
 	seedPhrase := ""
-	allSuggestedWords := strings.Join(pg.allSuggestions, " ")
+	allSuggestedWords := strings.Join(pg.getWordSeedType().AllWords(), " ")
 	numberOfSeed := pg.getWordSeedType().ToInt()
 	for i, editor := range pg.seedEditors.editors {
 		if i >= numberOfSeed {
@@ -443,6 +443,7 @@ func (pg *SeedRestore) validateSeeds() (bool, string) {
 }
 
 func (pg *SeedRestore) verifySeeds() bool {
+	fmt.Println("------verifySeeds----------22222222--->")
 	isValid, seedphrase := pg.validateSeeds()
 	pg.seedPhrase = ""
 
@@ -473,7 +474,7 @@ func (pg *SeedRestore) verifySeeds() bool {
 }
 
 func (pg *SeedRestore) resetSeeds() {
-	pg.allSuggestions = pg.getWordSeedType().AllWords()
+	// pg.allSuggestions = pg.getWordSeedType().AllWords()
 	pg.seedEditors.focusIndex = -1
 	for i := 0; i < len(pg.seedEditors.editors); i++ {
 		pg.seedEditors.editors[i].Edit.Editor.SetText("")
@@ -520,6 +521,7 @@ func (pg *SeedRestore) HandleUserInteractions() {
 	}
 
 	if pg.validateSeed.Clicked() {
+		fmt.Println("------validateSeed----------111111--->")
 		if !pg.verifySeeds() {
 			return
 		}