update format code

libwallet/assets/btc/wallet.go

@@ -238,10 +238,10 @@ func LoadExisting(w *sharedW.Wallet, params *sharedW.InitParams) (sharedW.Asset,
 		txAndBlockNotificationListeners: make(map[string]*sharedW.TxAndBlockNotificationListener),
 	}
 
-	// w.EncryptedSeed was previously deleted after verification. Existing
+	// w.EncryptedMnemonic was previously deleted after verification. Existing
 	// wallets created before the change to allow viewing wallet seed in-app
 	// should still behave normal but they can no longer view their seed.
-	if len(w.EncryptedSeed) == 0 && !w.IsBackedUp {
+	if len(w.EncryptedMnemonic) == 0 && !w.IsBackedUp {
 		w.IsBackedUp = true
 		if err := params.DB.Save(w); err != nil {
 			log.Errorf("DB.Save error: %v", err)

libwallet/assets/dcr/wallet.go

@@ -238,10 +238,10 @@ func LoadExisting(w *sharedW.Wallet, params *sharedW.InitParams) (sharedW.Asset,
 		dbMutex:                           &dbMutex,
 	}
 
-	// w.EncryptedSeed was previously deleted after verification. Existing
+	// w.EncryptedMnemonic was previously deleted after verification. Existing
 	// wallets created before the change to allow viewing wallet seed in-app
 	// should still behave normal but they can no longer view their seed.
-	if len(w.EncryptedSeed) == 0 && !w.IsBackedUp {
+	if len(w.EncryptedMnemonic) == 0 && !w.IsBackedUp {
 		w.IsBackedUp = true
 		if err := params.DB.Save(w); err != nil {
 			log.Errorf("DB.Save error: %v", err)

libwallet/assets/ltc/wallet.go

@@ -253,10 +253,10 @@ func LoadExisting(w *sharedW.Wallet, params *sharedW.InitParams) (sharedW.Asset,
 		txAndBlockNotificationListeners: make(map[string]*sharedW.TxAndBlockNotificationListener),
 	}
 
-	// w.EncryptedSeed was previously deleted after verification. Existing
+	// w.EncryptedMnemonic was previously deleted after verification. Existing
 	// wallets created before the change to allow viewing wallet seed in-app
 	// should still behave normal but they can no longer view their seed.
-	if len(w.EncryptedSeed) == 0 && !w.IsBackedUp {
+	if len(w.EncryptedMnemonic) == 0 && !w.IsBackedUp {
 		w.IsBackedUp = true
 		if err := params.DB.Save(w); err != nil {
 			log.Errorf("DB.Save error: %v", err)

libwallet/assets/wallet/wallet_shared.go

@@ -27,7 +27,7 @@ type Wallet struct {
 	db        *storm.DB
 	logDir    string
 
-	EncryptedSeed         []byte
+	EncryptedMnemonic     []byte
 	IsBackedUp            bool
 	IsRestored            bool
 	HasDiscoveredAccounts bool
@@ -257,7 +257,7 @@ func (wallet *Wallet) IsWalletBackedUp() bool {
 func (wallet *Wallet) HasWalletSeed() bool {
 	wallet.mu.RLock()
 	defer wallet.mu.RUnlock()
-	return len(wallet.EncryptedSeed) > 0
+	return len(wallet.EncryptedMnemonic) > 0
 }
 
 func (wallet *Wallet) GetWalletID() int {
@@ -344,7 +344,7 @@ func CreateNewWallet(pass *AuthInfo, loader loader.AssetLoader,
 		return nil, err
 	}
 
-	encryptedSeed, err := encryptWalletMnemonic([]byte(pass.PrivatePass), mnemonic)
+	encryptedMnemonic, err := encryptWalletMnemonic([]byte(pass.PrivatePass), mnemonic)
 	if err != nil {
 		return nil, err
 	}
@@ -356,7 +356,7 @@ func CreateNewWallet(pass *AuthInfo, loader loader.AssetLoader,
 		rootDir:               params.RootDir,
 		logDir:                params.LogDir,
 		CreatedAt:             time.Now(),
-		EncryptedSeed:         encryptedSeed,
+		EncryptedMnemonic:     encryptedMnemonic,
 		PrivatePassphraseType: pass.PrivatePassType,
 		HasDiscoveredAccounts: true,
 		Type:                  assetType,
@@ -474,7 +474,7 @@ func RestoreWallet(seedMnemonic string, pass *AuthInfo, loader loader.AssetLoade
 ) (*Wallet, error) {
 	// Ensure the encrypted seeds are available before creating wallet so we can
 	// return early.
-	encryptedSeed, err := encryptWalletMnemonic([]byte(pass.PrivatePass), seedMnemonic)
+	EncryptedMnemonic, err := encryptWalletMnemonic([]byte(pass.PrivatePass), seedMnemonic)
 	if err != nil {
 		log.Errorf("wallet.createWallet: error encrypting wallet seed: %v", err)
 		return nil, err
@@ -488,7 +488,7 @@ func RestoreWallet(seedMnemonic string, pass *AuthInfo, loader loader.AssetLoade
 		rootDir:               params.RootDir,
 		logDir:                params.LogDir,
 
-		EncryptedSeed:         encryptedSeed,
+		EncryptedMnemonic:     EncryptedMnemonic,
 		IsRestored:            true,
 		HasDiscoveredAccounts: false,
 		Type:                  assetType,
@@ -713,15 +713,15 @@ func (wallet *Wallet) ChangePrivatePassphraseForWallet(oldPrivatePassphrase, new
 
 	oldPassphrase := []byte(oldPrivatePassphrase)
 	newPassphrase := []byte(newPrivatePassphrase)
-	encryptedSeed := wallet.EncryptedSeed
+	EncryptedMnemonic := wallet.EncryptedMnemonic
 
-	if encryptedSeed != nil {
-		decryptedSeed, err := decryptWalletMnemonic(oldPassphrase, encryptedSeed)
+	if EncryptedMnemonic != nil {
+		decryptedSeed, err := decryptWalletMnemonic(oldPassphrase, EncryptedMnemonic)
 		if err != nil {
 			return err
 		}
 
-		encryptedSeed, err = encryptWalletMnemonic(newPassphrase, decryptedSeed)
+		EncryptedMnemonic, err = encryptWalletMnemonic(newPassphrase, decryptedSeed)
 		if err != nil {
 			return err
 		}
@@ -732,7 +732,7 @@ func (wallet *Wallet) ChangePrivatePassphraseForWallet(oldPrivatePassphrase, new
 		return utils.TranslateError(err)
 	}
 
-	wallet.EncryptedSeed = encryptedSeed
+	wallet.EncryptedMnemonic = EncryptedMnemonic
 	wallet.PrivatePassphraseType = privatePassphraseType
 	err = wallet.db.Save(wallet)
 	if err != nil {

libwallet/assets/wallet/wallet_utils.go

@@ -117,27 +117,27 @@ func (wallet *Wallet) batchDbTransaction(dbOp func(node storm.Node) error) (err
 	return err
 }
 
-// DecryptSeed decrypts wallet.EncryptedSeed using privatePassphrase
+// DecryptSeed decrypts wallet.EncryptedMnemonic using privatePassphrase
 func (wallet *Wallet) DecryptSeed(privatePassphrase string) (string, error) {
-	if wallet.EncryptedSeed == nil {
+	if wallet.EncryptedMnemonic == nil {
 		return "", errors.New(utils.ErrNoSeed)
 	}
 
-	return decryptWalletMnemonic([]byte(privatePassphrase), wallet.EncryptedSeed)
+	return decryptWalletMnemonic([]byte(privatePassphrase), wallet.EncryptedMnemonic)
 }
 
 // VerifySeedForWallet compares seedMnemonic with the decrypted
-// wallet.EncryptedSeed.
+// wallet.EncryptedMnemonic.
 func (wallet *Wallet) VerifySeedForWallet(seedMnemonic, privpass string) (bool, error) {
 	wallet.mu.RLock()
 	defer wallet.mu.RUnlock()
 
-	decryptedSeed, err := decryptWalletMnemonic([]byte(privpass), wallet.EncryptedSeed)
+	decryptedMnemonic, err := decryptWalletMnemonic([]byte(privpass), wallet.EncryptedMnemonic)
 	if err != nil {
 		return false, err
 	}
 
-	if decryptedSeed == seedMnemonic {
+	if decryptedMnemonic == seedMnemonic {
 		if wallet.IsBackedUp {
 			return true, nil // return early
 		}
@@ -176,12 +176,12 @@ func decryptWalletMnemonic(pass []byte, encryptedMnemonic []byte) (string, error
 		return "", err
 	}
 
-	decryptedSeed, err := secretbox.EasyOpen(encryptedMnemonic, key)
+	decryptedMnemonic, err := secretbox.EasyOpen(encryptedMnemonic, key)
 	if err != nil {
 		return "", errors.New(utils.ErrInvalidPassphrase)
 	}
 
-	return string(decryptedSeed), nil
+	return string(decryptedMnemonic), nil
 }
 
 // For use with gomobile bind,
@@ -204,13 +204,13 @@ func generateMnemonic(wordSeedType WordSeedType) (v string, err error) {
 			// Generate 33-word seeds from PGWord list
 			return walletseed.EncodeMnemonic(entropy), nil
 		}
-		// Create Seed phrase from entropy
-		// Use bip39 for generate 12-word seeds and 24-word seeds
-		seedPhrase, err := bip39.NewMnemonic(entropy)
+		// Create mnemonic from entropy
+		// Use bip39 to generate 12-word seeds and 24-word seeds
+		mnemonic, err := bip39.NewMnemonic(entropy)
 		if err != nil {
 			return "", err
 		}
-		return seedPhrase, nil
+		return mnemonic, nil
 	}
 
 	return "", fmt.Errorf("entropy is empty")