mirrors/bitcoin-s
1
0
Fork 0
mirror of https://github.com/bitcoin-s/bitcoin-s.git synced 2025-02-23 14:50:42 +01:00
Code Issues Projects Releases Packages Wiki Activity

Move function defs from wallet api to wallet (#1694)

Browse source
This commit is contained in:
Ben Carman 2020-07-25 16:37:48 -05:00 • committed by GitHub
parent 6e76600e3f
commit d6289eb5e7
2 changed files with 60 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

59
wallet/src/main/scala/org/bitcoins/wallet/Wallet.scala
View file

@ -7,6 +7,7 @@ import org.bitcoins.core.api.{ChainQueryApi, FeeRateApi, NodeApi}
import org.bitcoins.core.bloom.{BloomFilter, BloomUpdateAll}
import org.bitcoins.core.crypto.ExtPublicKey
import org.bitcoins.core.currency._
import org.bitcoins.core.gcs.{GolombFilter, SimpleFilterMatcher}
import org.bitcoins.core.hd.{HDAccount, HDCoin, HDPurposes}
import org.bitcoins.core.protocol.BitcoinAddress
import org.bitcoins.core.protocol.script.ScriptPubKey
@ -30,10 +31,15 @@ import org.bitcoins.core.wallet.utxo.{
ScriptSignatureParams,
TxoState
}
import org.bitcoins.crypto.{CryptoUtil, ECPublicKey}
import org.bitcoins.keymanager.KeyManagerParams
import org.bitcoins.keymanager.bip39.BIP39KeyManager
import org.bitcoins.crypto.{
AesPassword,
CryptoUtil,
DoubleSha256Digest,
ECPublicKey
}
import org.bitcoins.keymanager.bip39.{BIP39KeyManager, BIP39LockedKeyManager}
import org.bitcoins.keymanager.util.HDUtil
import org.bitcoins.keymanager.{KeyManagerParams, KeyManagerUnlockError}
import org.bitcoins.wallet.api._
import org.bitcoins.wallet.config.WalletAppConfig
import org.bitcoins.wallet.internal._
@ -119,6 +125,53 @@ abstract class Wallet
()
}
override def processCompactFilters(
blockFilters: Vector[(DoubleSha256Digest, GolombFilter)]): Future[
Wallet] = {
val utxosF = listUtxos()
val addressesF = listAddresses()
for {
utxos <- utxosF
addresses <- addressesF
scriptPubKeys =
utxos.flatMap(_.redeemScriptOpt).toSet ++ addresses
.map(_.scriptPubKey)
.toSet
_ <- FutureUtil.sequentially(blockFilters) {
case (blockHash, blockFilter) =>
val matcher = SimpleFilterMatcher(blockFilter)
if (matcher.matchesAny(scriptPubKeys.toVector.map(_.asmBytes))) {
nodeApi.downloadBlocks(Vector(blockHash))
} else FutureUtil.unit
}
} yield {
this
}
}
override def unlock(
passphrase: AesPassword,
bip39PasswordOpt: Option[String]): Either[
KeyManagerUnlockError,
Wallet] = {
val kmParams = walletConfig.kmParams
val unlockedKeyManagerE =
BIP39LockedKeyManager.unlock(passphrase = passphrase,
bip39PasswordOpt = bip39PasswordOpt,
kmParams = kmParams)
unlockedKeyManagerE match {
case Right(km) =>
val w = Wallet(keyManager = km,
nodeApi = nodeApi,
chainQueryApi = chainQueryApi,
feeRateApi = feeRateApi,
creationTime = km.creationTime)
Right(w)
case Left(err) => Left(err)
}
}
override def broadcastTransaction(transaction: Transaction): Future[Unit] =
for {
_ <- nodeApi.broadcastTransaction(transaction)

45
wallet/src/main/scala/org/bitcoins/wallet/api/WalletApi.scala
View file

@ -7,7 +7,7 @@ import org.bitcoins.core.api.{ChainQueryApi, FeeRateApi, NodeApi}
import org.bitcoins.core.bloom.BloomFilter
import org.bitcoins.core.config.NetworkParameters
import org.bitcoins.core.currency.CurrencyUnit
import org.bitcoins.core.gcs.{GolombFilter, SimpleFilterMatcher}
import org.bitcoins.core.gcs.GolombFilter
import org.bitcoins.core.hd.{AddressType, HDAccount, HDChainType, HDPurpose}
import org.bitcoins.core.protocol.blockchain.{Block, BlockHeader, ChainParams}
import org.bitcoins.core.protocol.script.ScriptPubKey
@ -26,7 +26,7 @@ import org.bitcoins.crypto.{
DoubleSha256DigestBE
}
import org.bitcoins.keymanager._
import org.bitcoins.keymanager.bip39.{BIP39KeyManager, BIP39LockedKeyManager}
import org.bitcoins.keymanager.bip39.BIP39KeyManager
import org.bitcoins.wallet.api.WalletApi.BlockMatchingResponse
import org.bitcoins.wallet.config.WalletAppConfig
import org.bitcoins.wallet.models.{AccountDb, AddressDb, SpendingInfoDb}
@ -107,27 +107,7 @@ trait WalletApi extends WalletLogger {
def processCompactFilters(
blockFilters: Vector[(DoubleSha256Digest, GolombFilter)]): Future[
WalletApi] = {
val utxosF = listUtxos()
val addressesF = listAddresses()
for {
utxos <- utxosF
addresses <- addressesF
scriptPubKeys =
utxos.flatMap(_.redeemScriptOpt).toSet ++ addresses
.map(_.scriptPubKey)
.toSet
_ <- FutureUtil.sequentially(blockFilters) {
case (blockHash, blockFilter) =>
val matcher = SimpleFilterMatcher(blockFilter)
if (matcher.matchesAny(scriptPubKeys.toVector.map(_.asmBytes))) {
nodeApi.downloadBlocks(Vector(blockHash))
} else FutureUtil.unit
}
} yield {
this
}
}
WalletApi]
/** Gets the sum of all UTXOs in this wallet */
def getBalance(): Future[CurrencyUnit] = {
@ -367,24 +347,7 @@ trait WalletApi extends WalletLogger {
*/
def unlock(passphrase: AesPassword, bip39PasswordOpt: Option[String]): Either[
KeyManagerUnlockError,
WalletApi] = {
val kmParams = walletConfig.kmParams
val unlockedKeyManagerE =
BIP39LockedKeyManager.unlock(passphrase = passphrase,
bip39PasswordOpt = bip39PasswordOpt,
kmParams = kmParams)
unlockedKeyManagerE match {
case Right(km) =>
val w = Wallet(keyManager = km,
nodeApi = nodeApi,
chainQueryApi = chainQueryApi,
feeRateApi = feeRateApi,
creationTime = km.creationTime)
Right(w)
case Left(err) => Left(err)
}
}
WalletApi]
def listAccounts(): Future[Vector[AccountDb]]