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

Add missing route for getaddressinfo (#1834)

Browse source
This commit is contained in:
Ben Carman 2020-08-17 06:27:16 -05:00 • committed by GitHub
parent 9e8e57505c
commit 4d46094d72
2 changed files with 39 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -8,6 +8,7 @@ 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.config.RegTest
import org.bitcoins.core.crypto.ExtPublicKey
import org.bitcoins.core.currency.{Bitcoins, CurrencyUnit, Satoshis}
import org.bitcoins.core.hd._
@ -37,6 +38,7 @@ import org.bitcoins.crypto.{
}
import org.bitcoins.node.Node
import org.bitcoins.wallet.MockWalletApi
import org.bitcoins.wallet.api.AddressInfo
import org.bitcoins.wallet.models._
import org.scalamock.scalatest.MockFactory
import org.scalatest.wordspec.AnyWordSpec
@ -472,6 +474,27 @@ class RoutesSpec extends AnyWordSpec with ScalatestRouteTest with MockFactory {
}
}
"get address info" in {
val key = ECPublicKey.freshPublicKey
val hdPath = HDPath.fromString("m/84'/1'/0'/0/0").get
(mockWalletApi
.getAddressInfo(_: BitcoinAddress))
.expects(testAddress)
.returning(Future.successful(Some(AddressInfo(key, RegTest, hdPath))))
val route =
walletRoutes.handleCommand(
ServerCommand("getaddressinfo", Arr(Str(testAddressStr))))
Get() ~> route ~> check {
contentType == `application/json`
responseAs[
String] == """{"result":"""" + key.hex + " " + hdPath.toString + """","error":null}"""
}
}
"return a new address with a label" in {
(mockWalletApi
.getNewAddress(_: Vector[AddressTag]))

16
app/server/src/main/scala/org/bitcoins/server/WalletRoutes.scala
View file

@ -317,6 +317,22 @@ case class WalletRoutes(wallet: AnyHDWalletApi, node: Node)(implicit
}
}
case ServerCommand("getaddressinfo", arr) =>
GetAddressInfo.fromJsArr(arr) match {
case Failure(err) =>
reject(ValidationRejection("failure", Some(err)))
case Success(GetAddressInfo(address)) =>
complete {
wallet.getAddressInfo(address).map {
case Some(addressInfo) =>
Server.httpSuccess(
s"${addressInfo.pubkey.hex} ${addressInfo.path.toString}")
case None =>
Server.httpSuccess("Wallet does not contain address")
}
}
}
case ServerCommand("createnewaccount", _) =>
complete {
for {