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

Move AddressTagDb to Core (#1850)

Browse source 
* Move AddressTagDb to Core

* Move to wallet api package
This commit is contained in:
Ben Carman 2020-08-21 16:31:30 -05:00 • committed by GitHub
parent adf6da5c5d
commit 9e06b826e1
7 changed files with 16 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
app/server-test/src/test/scala/org/bitcoins/server/RoutesSpec.scala
View file

@ -8,7 +8,11 @@ import akka.http.scaladsl.testkit.ScalatestRouteTest
import org.bitcoins.chain.api.ChainApi
import org.bitcoins.commons.jsonmodels.wallet.CoinSelectionAlgo
import org.bitcoins.core.Core
import org.bitcoins.core.api.wallet.db.{SegwitV0SpendingInfo, SpendingInfoDb}
import org.bitcoins.core.api.wallet.db.{
AddressTagDb,
SegwitV0SpendingInfo,
SpendingInfoDb
}
import org.bitcoins.core.config.RegTest
import org.bitcoins.core.crypto.ExtPublicKey
import org.bitcoins.core.currency.{Bitcoins, CurrencyUnit, Satoshis}
@ -25,13 +29,7 @@ import org.bitcoins.core.protocol.{BitcoinAddress, BlockStamp, P2PKHAddress}
import org.bitcoins.core.psbt.PSBT
import org.bitcoins.core.util.FutureUtil
import org.bitcoins.core.wallet.fee.{FeeUnit, SatoshisPerVirtualByte}
import org.bitcoins.core.wallet.utxo.{
AddressLabelTag,
AddressLabelTagType,
AddressTag,
AddressTagType,
TxoState
}
import org.bitcoins.core.wallet.utxo._
import org.bitcoins.crypto.{
DoubleSha256DigestBE,
ECPublicKey,

2
wallet/src/main/scala/org/bitcoins/wallet/models/AddressTagDb.scala → core/src/main/scala/org/bitcoins/core/api/wallet/db/AddressTagDb.scala
View file

@ -1,4 +1,4 @@
package org.bitcoins.wallet.models
package org.bitcoins.core.api.wallet.db
import org.bitcoins.core.protocol.BitcoinAddress
import org.bitcoins.core.wallet.utxo.{

1
wallet-test/src/test/scala/org/bitcoins/wallet/models/AddressTagDAOTest.scala
View file

@ -2,6 +2,7 @@ package org.bitcoins.wallet.models
import java.sql.SQLException
import org.bitcoins.core.api.wallet.db.AddressTagDb
import org.bitcoins.core.wallet.utxo.StorageLocationTag.HotStorage
import org.bitcoins.core.wallet.utxo.{
AddressTag,

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

@ -7,7 +7,7 @@ import org.bitcoins.core.api.chain.ChainQueryApi
import org.bitcoins.core.api.feeprovider.FeeRateApi
import org.bitcoins.core.api.keymanager.KeyManagerApi
import org.bitcoins.core.api.node.NodeApi
import org.bitcoins.core.api.wallet.db.SpendingInfoDb
import org.bitcoins.core.api.wallet.db.{AddressTagDb, SpendingInfoDb}
import org.bitcoins.core.config.NetworkParameters
import org.bitcoins.core.currency.CurrencyUnit
import org.bitcoins.core.hd.AddressType
@ -20,15 +20,10 @@ import org.bitcoins.core.protocol.transaction.{
}
import org.bitcoins.core.util.{FutureUtil, StartStopAsync}
import org.bitcoins.core.wallet.fee.FeeUnit
import org.bitcoins.core.wallet.utxo._
import org.bitcoins.core.wallet.utxo.{AddressTag, AddressTagType, TxoState}
import org.bitcoins.crypto.DoubleSha256DigestBE
import org.bitcoins.wallet.WalletLogger
import org.bitcoins.wallet.models.{
AddressDb,
AddressTagDb,
ScriptPubKeyDb,
TransactionDb
}
import org.bitcoins.wallet.models.{AddressDb, ScriptPubKeyDb, TransactionDb}
import scala.concurrent.{ExecutionContext, Future}
import scala.util.{Failure, Success}

2
wallet/src/main/scala/org/bitcoins/wallet/internal/AddressHandling.scala
View file

@ -2,6 +2,7 @@ package org.bitcoins.wallet.internal
import java.util.concurrent.atomic.AtomicBoolean
import org.bitcoins.core.api.wallet.db.AddressTagDb
import org.bitcoins.core.currency.CurrencyUnit
import org.bitcoins.core.hd._
import org.bitcoins.core.number.UInt32
@ -20,7 +21,6 @@ import org.bitcoins.wallet.models.{
AccountDb,
AddressDb,
AddressDbHelper,
AddressTagDb,
ScriptPubKeyDb
}

2
wallet/src/main/scala/org/bitcoins/wallet/internal/TransactionProcessing.scala
View file

@ -1,6 +1,6 @@
package org.bitcoins.wallet.internal
import org.bitcoins.core.api.wallet.db.SpendingInfoDb
import org.bitcoins.core.api.wallet.db.{AddressTagDb, SpendingInfoDb}
import org.bitcoins.core.currency.CurrencyUnit
import org.bitcoins.core.number.UInt32
import org.bitcoins.core.protocol.BitcoinAddress

4
wallet/src/main/scala/org/bitcoins/wallet/models/AddressTagDAO.scala
View file

@ -1,5 +1,7 @@
package org.bitcoins.wallet.models
import org.bitcoins.core.api.wallet.db
import org.bitcoins.core.api.wallet.db.AddressTagDb
import org.bitcoins.core.config.NetworkParameters
import org.bitcoins.core.protocol.BitcoinAddress
import org.bitcoins.core.protocol.transaction.Transaction
@ -177,7 +179,7 @@ case class AddressTagDAO()(implicit
private val fromTuple: AddressTagTuple => AddressTagDb = {
case (address, tagName, tagType) =>
AddressTagDb(address, tagName, tagType)
db.AddressTagDb(address, tagName, tagType)
}
private val toTuple: AddressTagDb => Option[AddressTagTuple] =