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

Fix lnd OutputDetails for outputs that dont have an address (#4438)

Browse source
This commit is contained in:
benthecarman 2022-06-30 08:57:01 -05:00 • committed by GitHub
parent 135b9f8a35
commit 678612161b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app-commons/src/main/scala/org/bitcoins/commons/jsonmodels/lnd/LndModels.scala
View file

@ -43,7 +43,7 @@ case class ChannelBalances(
) extends LndModel ) extends LndModel
case class OutputDetails( case class OutputDetails(
address: BitcoinAddress, addressOpt: Option[BitcoinAddress],
spk: ScriptPubKey, spk: ScriptPubKey,
outputIndex: Long, outputIndex: Long,
amount: CurrencyUnit, amount: CurrencyUnit,

2
lnd-rpc-test/src/test/scala/org/bitcoins/lnd/rpc/LndRpcClientPairTest.scala
View file

@ -197,7 +197,7 @@ class LndRpcClientPairTest extends DualLndFixture {
assert(details.tx == tx) assert(details.tx == tx)
assert(details.txId == tx.txIdBE) assert(details.txId == tx.txIdBE)
assert(details.outputDetails.map(_.address).contains(addr)) assert(details.outputDetails.flatMap(_.addressOpt).contains(addr))
assert(details.amount == sendAmt) assert(details.amount == sendAmt)
} }
} }

2
lnd-rpc/src/main/scala/org/bitcoins/lnd/rpc/LndUtils.scala
View file

@ -72,7 +72,7 @@ trait LndUtils {
implicit def lndOutputDetailToOutputDetails( implicit def lndOutputDetailToOutputDetails(
detail: lnrpc.OutputDetail): OutputDetails = { detail: lnrpc.OutputDetail): OutputDetails = {
OutputDetails( OutputDetails(
address = BitcoinAddress.fromString(detail.address), addressOpt = BitcoinAddress.fromStringOpt(detail.address),
spk = ScriptPubKey.fromAsmHex(detail.pkScript), spk = ScriptPubKey.fromAsmHex(detail.pkScript),
outputIndex = detail.outputIndex, outputIndex = detail.outputIndex,
amount = Satoshis(detail.amount), amount = Satoshis(detail.amount),