Merge branch 'master' into senddestination_verify_address

Author: ReevesAk

accounts.go

@@ -9,8 +9,8 @@ import (
 	"github.com/decred/dcrwallet/errors/v2"
 )
 
-func (wallet *Wallet) GetAccounts(requiredConfirmations int32) (string, error) {
-	accountsResponse, err := wallet.GetAccountsRaw(requiredConfirmations)
+func (wallet *Wallet) GetAccounts() (string, error) {
+	accountsResponse, err := wallet.GetAccountsRaw()
 	if err != nil {
 		return "", nil
 	}
@@ -19,14 +19,14 @@ func (wallet *Wallet) GetAccounts(requiredConfirmations int32) (string, error) {
 	return string(result), nil
 }
 
-func (wallet *Wallet) GetAccountsRaw(requiredConfirmations int32) (*Accounts, error) {
+func (wallet *Wallet) GetAccountsRaw() (*Accounts, error) {
 	resp, err := wallet.internal.Accounts(wallet.shutdownContext())
 	if err != nil {
 		return nil, err
 	}
 	accounts := make([]*Account, len(resp.Accounts))
 	for i, account := range resp.Accounts {
-		balance, err := wallet.GetAccountBalance(int32(account.AccountNumber), requiredConfirmations)
+		balance, err := wallet.GetAccountBalance(int32(account.AccountNumber))
 		if err != nil {
 			return nil, err
 		}
@@ -51,8 +51,8 @@ func (wallet *Wallet) GetAccountsRaw(requiredConfirmations int32) (*Accounts, er
 	}, nil
 }
 
-func (wallet *Wallet) AccountsIterator(requiredConfirmations int32) (*AccountsIterator, error) {
-	accounts, err := wallet.GetAccountsRaw(requiredConfirmations)
+func (wallet *Wallet) AccountsIterator() (*AccountsIterator, error) {
+	accounts, err := wallet.GetAccountsRaw()
 	if err != nil {
 		return nil, err
 	}
@@ -77,13 +77,13 @@ func (accountsInterator *AccountsIterator) Reset() {
 	accountsInterator.currentIndex = 0
 }
 
-func (wallet *Wallet) GetAccount(accountNumber int32, requiredConfirmations int32) (*Account, error) {
+func (wallet *Wallet) GetAccount(accountNumber int32) (*Account, error) {
 	props, err := wallet.internal.AccountProperties(wallet.shutdownContext(), uint32(accountNumber))
 	if err != nil {
 		return nil, err
 	}
 
-	balance, err := wallet.GetAccountBalance(accountNumber, requiredConfirmations)
+	balance, err := wallet.GetAccountBalance(accountNumber)
 	if err != nil {
 		return nil, err
 	}
@@ -102,8 +102,8 @@ func (wallet *Wallet) GetAccount(accountNumber int32, requiredConfirmations int3
 	return account, nil
 }
 
-func (wallet *Wallet) GetAccountBalance(accountNumber int32, requiredConfirmations int32) (*Balance, error) {
-	balance, err := wallet.internal.CalculateAccountBalance(wallet.shutdownContext(), uint32(accountNumber), requiredConfirmations)
+func (wallet *Wallet) GetAccountBalance(accountNumber int32) (*Balance, error) {
+	balance, err := wallet.internal.CalculateAccountBalance(wallet.shutdownContext(), uint32(accountNumber), wallet.RequiredConfirmations())
 	if err != nil {
 		return nil, err
 	}
@@ -119,8 +119,8 @@ func (wallet *Wallet) GetAccountBalance(accountNumber int32, requiredConfirmatio
 	}, nil
 }
 
-func (wallet *Wallet) SpendableForAccount(account int32, requiredConfirmations int32) (int64, error) {
-	bals, err := wallet.internal.CalculateAccountBalance(wallet.shutdownContext(), uint32(account), requiredConfirmations)
+func (wallet *Wallet) SpendableForAccount(account int32) (int64, error) {
+	bals, err := wallet.internal.CalculateAccountBalance(wallet.shutdownContext(), uint32(account), wallet.RequiredConfirmations())
 	if err != nil {
 		log.Error(err)
 		return 0, translateError(err)

log.go

@@ -142,6 +142,12 @@ func setLogLevel(subsystemID string, logLevel string) {
 	logger.SetLevel(level)
 }
 
+// Log writes a message to the log using LevelInfo.
 func Log(m string) {
 	log.Info(m)
 }
+
+// LogT writes a tagged message to the log using LevelInfo.
+func LogT(tag, m string) {
+	log.Infof("%s: %s", tag, m)
+}

multiwallet.go

@@ -7,6 +7,7 @@ import (
 	"path/filepath"
 	"strconv"
 	"strings"
+	"sync"
 
 	"github.com/asdine/storm"
 	"github.com/asdine/storm/q"
@@ -29,6 +30,7 @@ type MultiWallet struct {
 	wallets     map[int]*Wallet
 	syncData    *syncData
 
+	notificationListenersMu         sync.RWMutex
 	txAndBlockNotificationListeners map[string]TxAndBlockNotificationListener
 	blocksRescanProgressListener    BlocksRescanProgressListener
 
@@ -296,10 +298,6 @@ func (mw *MultiWallet) RestoreWallet(seedMnemonic, privatePassphrase string, pri
 }
 
 func (mw *MultiWallet) LinkExistingWallet(walletDataDir, originalPubPass string, privatePassphraseType int32) (*Wallet, error) {
-	if mw.IsSyncing() {
-		return nil, errors.New(ErrSyncAlreadyInProgress)
-	}
-
 	// check if `walletDataDir` contains wallet.db
 	if !WalletExistsAt(walletDataDir) {
 		return nil, errors.New(ErrNotExist)
@@ -374,20 +372,20 @@ func (mw *MultiWallet) LinkExistingWallet(walletDataDir, originalPubPass string,
 // - calls the provided `setupWallet` function to perform any necessary creation,
 //   restoration or linking of the just saved wallet
 //
-// Iff all the above operations succeed, the wallet info will be persisted to db
+// IFF all the above operations succeed, the wallet info will be persisted to db
 // and the wallet will be added to `mw.wallets`.
 func (mw *MultiWallet) saveNewWallet(wallet *Wallet, setupWallet func() error) (*Wallet, error) {
-	if mw.IsSyncing() {
-		return nil, errors.New(ErrSyncAlreadyInProgress)
-	}
-
 	exists, err := mw.WalletNameExists(wallet.Name)
 	if err != nil {
 		return nil, err
 	} else if exists {
 		return nil, errors.New(ErrExist)
 	}
 
+	if mw.IsConnectedToDecredNetwork() {
+		mw.CancelSync()
+		defer mw.SpvSync()
+	}
 	// Perform database save operations in batch transaction
 	// for automatic rollback if error occurs at any point.
 	err = mw.batchDbTransaction(func(db storm.Node) error {
@@ -445,15 +443,21 @@ func (mw *MultiWallet) RenameWallet(walletID int, newName string) error {
 }
 
 func (mw *MultiWallet) DeleteWallet(walletID int, privPass []byte) error {
-	if mw.IsSyncing() {
-		return errors.New(ErrSyncAlreadyInProgress)
-	}
 
 	wallet := mw.WalletWithID(walletID)
 	if wallet == nil {
 		return errors.New(ErrNotExist)
 	}
 
+	if mw.IsConnectedToDecredNetwork() {
+		mw.CancelSync()
+		defer func() {
+			if mw.OpenedWalletsCount() > 0 {
+				mw.SpvSync()
+			}
+		}()
+	}
+
 	err := wallet.deleteWallet(privPass)
 	if err != nil {
 		return translateError(err)

multiwallet_config.go

@@ -33,7 +33,7 @@ const (
 )
 
 type configSaveFn = func(key string, value interface{}) error
-type configReadFn = func(key string, valueOut interface{}) error
+type configReadFn = func(multiwallet bool, key string, valueOut interface{}) error
 
 func (mw *MultiWallet) walletConfigSetFn(walletID int) configSaveFn {
 	return func(key string, value interface{}) error {
@@ -43,9 +43,11 @@ func (mw *MultiWallet) walletConfigSetFn(walletID int) configSaveFn {
 }
 
 func (mw *MultiWallet) walletConfigReadFn(walletID int) configReadFn {
-	return func(key string, valueOut interface{}) error {
-		walletUniqueKey := WalletUniqueConfigKey(walletID, key)
-		return mw.db.Get(userConfigBucketName, walletUniqueKey, valueOut)
+	return func(multiwallet bool, key string, valueOut interface{}) error {
+		if !multiwallet {
+			key = WalletUniqueConfigKey(walletID, key)
+		}
+		return mw.db.Get(userConfigBucketName, key, valueOut)
 	}
 }
 

multiwallet_utils.go

@@ -2,6 +2,8 @@ package dcrlibwallet
 
 import (
 	"context"
+	"os"
+	"path/filepath"
 
 	"github.com/asdine/storm"
 	"github.com/decred/dcrwallet/errors/v2"
@@ -98,3 +100,19 @@ func (mw *MultiWallet) setNetworkBackend(syncer *spv.Syncer) {
 		}
 	}
 }
+
+// RootDirFileSizeInBytes returns the total directory size of
+// multiwallet's root directory in bytes.
+func (mw *MultiWallet) RootDirFileSizeInBytes() (int64, error) {
+	var size int64
+	err := filepath.Walk(mw.rootDir, func(_ string, info os.FileInfo, err error) error {
+		if err != nil {
+			return err
+		}
+		if !info.IsDir() {
+			size += info.Size()
+		}
+		return err
+	})
+	return size, err
+}

spv/go.mod

@@ -6,7 +6,6 @@ require (
 	github.com/decred/dcrd/addrmgr v1.1.0
 	github.com/decred/dcrd/blockchain/stake/v2 v2.0.2
 	github.com/decred/dcrd/chaincfg/chainhash v1.0.2
-	github.com/decred/dcrd/dcrec/secp256k1 v1.0.2 // indirect
 	github.com/decred/dcrd/dcrutil/v2 v2.0.1
 	github.com/decred/dcrd/gcs v1.1.0
 	github.com/decred/dcrd/txscript/v2 v2.1.0

spv/go.sum

@@ -20,6 +20,7 @@ github.com/decred/base58 v1.0.1/go.mod h1:H2ENcsJjye1G7CbRa67kV9OFaui0LGr56ntKKo
 github.com/decred/dcrd/addrmgr v1.0.2/go.mod h1:gNnmTuf/Xkg8ZX3j5GXbajzPrSdf5bA7HitO2bjmq0Q=
 github.com/decred/dcrd/addrmgr v1.1.0 h1:VQkn1qmafZypfN2u7yi7J/girwz4ZDicquo7JzsoxdQ=
 github.com/decred/dcrd/addrmgr v1.1.0/go.mod h1:exghL+0+QeVvO4MXezWJ1C2tcpBn3ngfuP6S1R+adB8=
+github.com/decred/dcrd/blockchain/stake v1.0.1 h1:IYGsNZRyMUsoFtVAUjd7XIccrIQ4YIqDeNzQJCjyS8A=
 github.com/decred/dcrd/blockchain/stake v1.0.1/go.mod h1:hgoGmWMIu2LLApBbcguVpzCEEfX7M2YhuMrQdpohJzc=
 github.com/decred/dcrd/blockchain/stake/v2 v2.0.0/go.mod h1:jv/rKMcZ87lhvVkHot/tElxeAYEUJ3mnKPHJ7WPq86U=
 github.com/decred/dcrd/blockchain/stake/v2 v2.0.2 h1:tRrJTywABGsUpf6qrTrtdIOKXyZflA51b0sqWf7p5gk=
@@ -44,6 +45,7 @@ github.com/decred/dcrd/crypto/blake256 v1.0.0 h1:/8DMNYp9SGi5f0w7uCm6d6M4OU2rGFK
 github.com/decred/dcrd/crypto/blake256 v1.0.0/go.mod h1:sQl2p6Y26YV+ZOcSTP6thNdn47hh8kt6rqSlvmrXFAc=
 github.com/decred/dcrd/crypto/ripemd160 v1.0.0 h1:MciTnR4NfBqDFRFjFkrn8WPLP4Vo7t6ww6ghfn6wcXQ=
 github.com/decred/dcrd/crypto/ripemd160 v1.0.0/go.mod h1:F0H8cjIuWTRoixr/LM3REB8obcWkmYx0gbxpQWR8RPg=
+github.com/decred/dcrd/database v1.0.1 h1:BSIerNf4RhSA0iDhiE/320RYqD2y9T+SCj99Pv7svgo=
 github.com/decred/dcrd/database v1.0.1/go.mod h1:ILCeyOHFew3fZ7K2B9jl+tp5qFOap/pEGoo6Yy6Wk0g=
 github.com/decred/dcrd/database/v2 v2.0.0/go.mod h1:Sj2lvTRB0mfSu9uD7ObfwCY/eJ954GFU/X+AndJIyfE=
 github.com/decred/dcrd/database/v2 v2.0.1 h1:ghLzkKpVpwvjrdRv3njrEfkvygQpYQX66sGVs8ha+E8=
@@ -67,6 +69,7 @@ github.com/decred/dcrd/dcrec/secp256k1/v2 v2.0.0 h1:3GIJYXQDAKpLEFriGFN8SbSffak1
 github.com/decred/dcrd/dcrec/secp256k1/v2 v2.0.0/go.mod h1:3s92l0paYkZoIHuj4X93Teg/HB7eGM9x/zokGw+u4mY=
 github.com/decred/dcrd/dcrjson/v3 v3.0.1 h1:b9cpplNJG+nutE2jS8K/BtSGIJihEQHhFjFAsvJF/iI=
 github.com/decred/dcrd/dcrjson/v3 v3.0.1/go.mod h1:fnTHev/ABGp8IxFudDhjGi9ghLiXRff1qZz/wvq12Mg=
+github.com/decred/dcrd/dcrutil v1.1.1 h1:zOkGiumN/JkobhAgpG/zfFgUoolGKVGYT5na1hbYUoE=
 github.com/decred/dcrd/dcrutil v1.1.1/go.mod h1:Jsttr0pEvzPAw+qay1kS1/PsbZYPyhluiNwwY6yBJS4=
 github.com/decred/dcrd/dcrutil/v2 v2.0.0/go.mod h1:gUshVAXpd51DlcEhr51QfWL2HJGkMDM1U8chY+9VvQg=
 github.com/decred/dcrd/dcrutil/v2 v2.0.1 h1:aL+c7o7Q66HV1gIif+XkNYo9DeorN3l01Vns8mh0mqs=
@@ -79,6 +82,7 @@ github.com/decred/dcrd/hdkeychain/v2 v2.1.0 h1:NVNIz36HPukOnaysBDsLO+2kWqijLM4tv
 github.com/decred/dcrd/hdkeychain/v2 v2.1.0/go.mod h1:DR+lD4uV8G0i3c9qnUJwjiGaaEWK+nSrbWCz1BRHBL8=
 github.com/decred/dcrd/rpc/jsonrpc/types v1.0.1 h1:sWsGtWzdmrna6aysDCHwjANTJh+Lxt2xp6S10ahP79Y=
 github.com/decred/dcrd/rpc/jsonrpc/types v1.0.1/go.mod h1:dJUp9PoyFYklzmlImpVkVLOr6j4zKuUv66YgemP2sd8=
+github.com/decred/dcrd/txscript v1.0.1 h1:IMgxZFCw3AyG4EbKwywE3SDNshOSHsoUK1Wk/5GqWJ0=
 github.com/decred/dcrd/txscript v1.0.1/go.mod h1:FqUX07Y+u3cJ1eIGPoyWbJg+Wk1NTllln/TyDpx9KnY=
 github.com/decred/dcrd/txscript/v2 v2.0.0/go.mod h1:WStcyYYJa+PHJB4XjrLDRzV96/Z4thtsu8mZoVrU6C0=
 github.com/decred/dcrd/txscript/v2 v2.1.0 h1:IKIpNm0lPmNQoaZ2zxZm1qMwfmLb/XXeahxXlfc+MrA=

sync.go

@@ -309,6 +309,12 @@ func (wallet *Wallet) IsSyncing() bool {
 	return wallet.syncing
 }
 
+func (mw *MultiWallet) IsConnectedToDecredNetwork() bool {
+	mw.syncData.mu.RLock()
+	defer mw.syncData.mu.RUnlock()
+	return mw.syncData.syncing || mw.syncData.synced
+}
+
 func (mw *MultiWallet) IsSynced() bool {
 	mw.syncData.mu.RLock()
 	defer mw.syncData.mu.RUnlock()

txandblocknotifications.go

@@ -62,6 +62,9 @@ func (mw *MultiWallet) listenForTransactions(walletID int) {
 }
 
 func (mw *MultiWallet) AddTxAndBlockNotificationListener(txAndBlockNotificationListener TxAndBlockNotificationListener, uniqueIdentifier string) error {
+	mw.notificationListenersMu.Lock()
+	defer mw.notificationListenersMu.Unlock()
+
 	_, ok := mw.txAndBlockNotificationListeners[uniqueIdentifier]
 	if ok {
 		return errors.New(ErrListenerAlreadyExist)
@@ -73,22 +76,34 @@ func (mw *MultiWallet) AddTxAndBlockNotificationListener(txAndBlockNotificationL
 }
 
 func (mw *MultiWallet) RemoveTxAndBlockNotificationListener(uniqueIdentifier string) {
+	mw.notificationListenersMu.Lock()
+	defer mw.notificationListenersMu.Unlock()
+
 	delete(mw.txAndBlockNotificationListeners, uniqueIdentifier)
 }
 
 func (mw *MultiWallet) mempoolTransactionNotification(transaction string) {
+	mw.notificationListenersMu.RLock()
+	defer mw.notificationListenersMu.RUnlock()
+
 	for _, txAndBlockNotifcationListener := range mw.txAndBlockNotificationListeners {
 		txAndBlockNotifcationListener.OnTransaction(transaction)
 	}
 }
 
 func (mw *MultiWallet) publishTransactionConfirmed(walletID int, transactionHash string, blockHeight int32) {
+	mw.notificationListenersMu.RLock()
+	defer mw.notificationListenersMu.RUnlock()
+
 	for _, txAndBlockNotifcationListener := range mw.txAndBlockNotificationListeners {
 		txAndBlockNotifcationListener.OnTransactionConfirmed(walletID, transactionHash, blockHeight)
 	}
 }
 
 func (mw *MultiWallet) publishBlockAttached(walletID int, blockHeight int32) {
+	mw.notificationListenersMu.RLock()
+	defer mw.notificationListenersMu.RUnlock()
+
 	for _, txAndBlockNotifcationListener := range mw.txAndBlockNotificationListeners {
 		txAndBlockNotifcationListener.OnBlockAttached(walletID, blockHeight)
 	}