Skip to content

Commit

Permalink
Do not error on dev subsidy address that cannot be decoded (e.g. test…
Browse files Browse the repository at this point in the history
…net).
  • Loading branch information
chappjc committed Nov 7, 2017
1 parent efaa57f commit 29d13f2
Showing 1 changed file with 7 additions and 4 deletions.
11 changes: 7 additions & 4 deletions db/dcrpg/pgblockchain.go
Original file line number Diff line number Diff line change
Expand Up @@ -72,15 +72,18 @@ func NewChainDB(dbi *DBInfo, params *chaincfg.Params) (*ChainDB, error) {
strings.HasSuffix(err.Error(), "does not exist")) {
return nil, err
}
_, devSubsidyAddress, _, err := txscript.ExtractPkScriptAddrs(
_, devSubsidyAddresses, _, err := txscript.ExtractPkScriptAddrs(
params.OrganizationPkScriptVersion, params.OrganizationPkScript, params)
if err != nil || len(devSubsidyAddress) != 1 {
return nil, fmt.Errorf("Failed to decode dev subsidy address: %v", err)
var devSubsidyAddress string
if err != nil || len(devSubsidyAddresses) != 1 {
log.Warnf("Failed to decode dev subsidy address: %v", err)
} else {
devSubsidyAddress = devSubsidyAddresses[0].String()
}
return &ChainDB{
db: db,
chainParams: params,
devAddress: devSubsidyAddress[0].String(),
devAddress: devSubsidyAddress,
dupChecks: true,
bestBlock: int64(bestHeight),
lastBlock: make(map[chainhash.Hash]uint64),
Expand Down

0 comments on commit 29d13f2

Please sign in to comment.