mirrors/bitcoin-s
1
0
Fork 0
mirror of https://github.com/bitcoin-s/bitcoin-s.git synced 2025-03-13 11:35:40 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fix hardcoded network for the default wallet account (#1277)

Browse source 
* Fix hardcoded network for the default wallet account

* Refactor call to HDUtil.getCoinType()
This commit is contained in:
Chris Stewart 2020-03-30 12:30:48 -05:00 • committed by GitHub
parent 14b13eb612
commit 5eef801813
3 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
core/src/main/scala/org/bitcoins/core/hd/HDCoinType.scala
View file

@ -1,5 +1,7 @@
package org.bitcoins.core.hd
import org.bitcoins.core.config.{MainNet, NetworkParameters, RegTest, TestNet3}
/**
* Represents a
* [[https://github.com/bitcoin/bips/blob/master/bip-0044.mediawiki#Coin_type BIP44]],
@ -33,4 +35,11 @@ object HDCoinType {
case _: Int =>
throw new IllegalArgumentException(s"$int is not valid coin type!")
}
def fromNetwork(np: NetworkParameters): HDCoinType = {
np match {
case MainNet => Bitcoin
case TestNet3 | RegTest => Testnet
}
}
}

5
key-manager/src/main/scala/org/bitcoins/keymanager/util/HDUtil.scala
View file

@ -74,8 +74,7 @@ object HDUtil {
}
}
def getCoinType(network: NetworkParameters): HDCoinType = network match {
case MainNet => HDCoinType.Bitcoin
case TestNet3 | RegTest => HDCoinType.Testnet
def getCoinType(network: NetworkParameters): HDCoinType = {
HDCoinType.fromNetwork(network)
}
}

2
wallet/src/main/scala/org/bitcoins/wallet/config/WalletAppConfig.scala
View file

@ -51,7 +51,7 @@ case class WalletAppConfig(
lazy val defaultAccount: HDAccount = {
val purpose = defaultAccountKind
HDAccount(coin = HDCoin(purpose, HDCoinType.Testnet), index = 0)
HDAccount(coin = HDCoin(purpose, HDCoinType.fromNetwork(network)), index = 0)
}
lazy val bloomFalsePositiveRate: Double =