mirrors/bitcoin-s
1
0
Fork 0
mirror of https://github.com/bitcoin-s/bitcoin-s.git synced 2024-11-19 18:02:54 +01:00
Code Issues Packages Projects Releases Wiki Activity

getNewAddressHelper Refactor (#1322)

Browse Source
This commit is contained in:
Ben Carman 2020-04-09 12:54:28 -05:00 committed by GitHub
parent 8ffd2d11ae
commit 8a079d25d7
1 changed files with 46 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

81
wallet/src/main/scala/org/bitcoins/wallet/internal/AddressHandling.scala
View File

@ -89,10 +89,10 @@ private[wallet] trait AddressHandling extends WalletLogger {
* @param account Account to generate address from
* @param chainType What chain do we generate from? Internal change vs. external
*/
private def getNewAddressHelper(
private def getNewAddressDb(
account: AccountDb,
chainType: HDChainType
): Future[BitcoinAddress] = {
): Future[AddressDb] = {
logger.debug(s"Getting new $chainType adddress for ${account.hdAccount}")
val lastAddrOptF = chainType match {
@ -102,7 +102,7 @@ private[wallet] trait AddressHandling extends WalletLogger {
addressDAO.findMostRecentChange(account.hdAccount)
}
lastAddrOptF.flatMap { lastAddrOpt =>
lastAddrOptF.map { lastAddrOpt =>
val addrPath: HDPath = lastAddrOpt match {
case Some(addr) =>
val next = addr.path.next
@ -117,45 +117,56 @@ private[wallet] trait AddressHandling extends WalletLogger {
path
}
val addressDb = {
val pathDiff =
account.hdAccount.diff(addrPath) match {
case Some(value) => value
case None =>
throw new RuntimeException(
s"Could not diff ${account.hdAccount} and $addrPath")
}
val pubkey = account.xpub.deriveChildPubKey(pathDiff) match {
case Failure(exception) => throw exception
case Success(value) => value.key
val pathDiff =
account.hdAccount.diff(addrPath) match {
case Some(value) => value
case None =>
throw new RuntimeException(
s"Could not diff ${account.hdAccount} and $addrPath")
}
addrPath match {
case segwitPath: SegWitHDPath =>
AddressDbHelper
.getSegwitAddress(pubkey, segwitPath, networkParameters)
case legacyPath: LegacyHDPath =>
AddressDbHelper.getLegacyAddress(pubkey,
legacyPath,
networkParameters)
case nestedPath: NestedSegWitHDPath =>
AddressDbHelper.getNestedSegwitAddress(pubkey,
nestedPath,
networkParameters)
}
}
logger.debug(s"Writing $addressDb to DB")
val writeF = addressDAO.create(addressDb)
writeF.foreach { written =>
logger.debug(
s"Got ${chainType} address ${written.address} at key path ${written.path} with pubkey ${written.ecPublicKey}")
val pubkey = account.xpub.deriveChildPubKey(pathDiff) match {
case Failure(exception) => throw exception
case Success(value) => value.key
}
writeF.map(_.address)
addrPath match {
case segwitPath: SegWitHDPath =>
AddressDbHelper
.getSegwitAddress(pubkey, segwitPath, networkParameters)
case legacyPath: LegacyHDPath =>
AddressDbHelper.getLegacyAddress(pubkey,
legacyPath,
networkParameters)
case nestedPath: NestedSegWitHDPath =>
AddressDbHelper.getNestedSegwitAddress(pubkey,
nestedPath,
networkParameters)
}
}
}
private def getNewAddressHelper(
account: AccountDb,
chainType: HDChainType
): Future[BitcoinAddress] = {
for {
addressDb <- getNewAddressDb(account, chainType)
_ = logger.debug(s"Writing $addressDb to DB")
written <- addressDAO.create(addressDb)
} yield {
logger.debug(
s"Got ${chainType} address ${written.address} at key path ${written.path} with pubkey ${written.ecPublicKey}")
written.address
}
}
def getNextAvailableIndex(
accountDb: AccountDb,
chainType: HDChainType): Future[Int] = {
getNewAddressDb(accountDb, chainType).map(_.path.path.last.index)
}
def getNewAddress(account: HDAccount): Future[BitcoinAddress] = {
val accountDbOptF = findAccount(account)
accountDbOptF.flatMap {