Merge branch 'v0-16-1-branch-rc1-7588' into v0-16-1-branch-rc1

This commit is contained in:
Olaoluwa Osuntokun 2023-04-18 18:23:03 -07:00
commit b129e10da3

View file

@ -1231,6 +1231,15 @@ func ValidateConfig(cfg Config, interceptor signal.Interceptor, fileParser,
if cfg.Bitcoin.SimNet {
numNets++
cfg.ActiveNetParams = chainreg.BitcoinSimNetParams
// For simnet, the btcsuite chain params uses a
// cointype of 115. However, we override this in
// chainreg/chainparams.go, but the raw ChainParam
// field is used elsewhere. To ensure everything is
// consistent, we'll also override the cointype within
// the raw params.
targetCoinType := chainreg.BitcoinSigNetParams.CoinType
cfg.ActiveNetParams.Params.HDCoinType = targetCoinType
}
if cfg.Bitcoin.SigNet {
numNets++