LBRYCommunity/lbcwallet
1
0
Fork 0
Code Issues 5 Pull requests Projects Releases 14 Packages Wiki Activity

Merge pull request #602 from wpaulino/wallet-sync-dev-env

Browse source 
wallet/wallet: accept 0 bestHeight in developer environments
This commit is contained in:
Olaoluwa Osuntokun 2019-03-12 20:17:22 -07:00 committed by GitHub
commit ecfdd888dd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 32 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
wallet/wallet.go
View file

@ -450,6 +450,18 @@ func (w *Wallet) syncWithChain(birthdayStamp *waddrmgr.BlockStamp) error {
return w.rescanWithTarget(addrs, unspent, nil) return w.rescanWithTarget(addrs, unspent, nil)
} }
// isDevEnv determines whether the wallet is currently under a local developer
// environment, e.g. simnet or regtest.
func (w *Wallet) isDevEnv() bool {
switch uint32(w.ChainParams().Net) {
case uint32(chaincfg.RegressionNetParams.Net):
case uint32(chaincfg.SimNetParams.Net):
default:
return false
}
return true
}
// scanChain is a helper method that scans the chain from the starting height // scanChain is a helper method that scans the chain from the starting height
// until the tip of the chain. The onBlock callback can be used to perform // until the tip of the chain. The onBlock callback can be used to perform
// certain operations for every block that we process as we scan the chain. // certain operations for every block that we process as we scan the chain.
@ -463,7 +475,7 @@ func (w *Wallet) scanChain(startHeight int32,
// isCurrent is a helper function that we'll use to determine if the // isCurrent is a helper function that we'll use to determine if the
// chain backend is currently synced. When running with a btcd or // chain backend is currently synced. When running with a btcd or
// bitcoind backend, It will use the height of the latest checkpoint as // bitcoind backend, it will use the height of the latest checkpoint as
// its lower bound. // its lower bound.
var latestCheckptHeight int32 var latestCheckptHeight int32
if len(w.chainParams.Checkpoints) > 0 { if len(w.chainParams.Checkpoints) > 0 {
@ -471,9 +483,10 @@ func (w *Wallet) scanChain(startHeight int32,
Checkpoints[len(w.chainParams.Checkpoints)-1].Height Checkpoints[len(w.chainParams.Checkpoints)-1].Height
} }
isCurrent := func(bestHeight int32) bool { isCurrent := func(bestHeight int32) bool {
// If the best height is zero, we assume the chain backend // If the best height is zero, we assume the chain backend is
// still is looking for peers to sync to. // still looking for peers to sync to in the case of a global
if bestHeight == 0 { // network, e.g., testnet and mainnet.
if bestHeight == 0 && !w.isDevEnv() {
return false return false
} }
@ -599,13 +612,26 @@ func (w *Wallet) syncToBirthday() (*waddrmgr.BlockStamp, error) {
} }
// If a birthday stamp has yet to be found, we'll return an error // If a birthday stamp has yet to be found, we'll return an error
// indicating so. // indicating so, but only if this is a live chain like it is the case
if birthdayStamp == nil { // with testnet and mainnet.
if birthdayStamp == nil && !w.isDevEnv() {
tx.Rollback() tx.Rollback()
return nil, fmt.Errorf("did not find a suitable birthday "+ return nil, fmt.Errorf("did not find a suitable birthday "+
"block with a timestamp greater than %v", birthday) "block with a timestamp greater than %v", birthday)
} }
// Otherwise, if we're in a development environment and we've yet to
// find a birthday block due to the chain not being current, we'll
// use the last block we've synced to as our birthday to proceed.
if birthdayStamp == nil {
syncedTo := w.Manager.SyncedTo()
err := w.Manager.SetBirthdayBlock(ns, syncedTo, true)
if err != nil {
return nil, err
}
birthdayStamp = &syncedTo
}
if err := tx.Commit(); err != nil { if err := tx.Commit(); err != nil {
tx.Rollback() tx.Rollback()
return nil, err return nil, err