From 29d13f287b552b5cdce8052dd220551f510d49f7 Mon Sep 17 00:00:00 2001 From: Jon Chappelow Date: Tue, 7 Nov 2017 09:39:32 -0700 Subject: [PATCH] Do not error on dev subsidy address that cannot be decoded (e.g. testnet). --- db/dcrpg/pgblockchain.go | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/db/dcrpg/pgblockchain.go b/db/dcrpg/pgblockchain.go index 204ed5ae6..3cd807cd5 100644 --- a/db/dcrpg/pgblockchain.go +++ b/db/dcrpg/pgblockchain.go @@ -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),