Skip to content

Configure bitcoind test instances to use bech32m addresses #3191

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
sstone wants to merge 1 commit into from
Closed

Configure bitcoind test instances to use bech32m addresses #3191

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions eclair-core/src/test/scala/fr/acinq/eclair/blockchain/bitcoind/BitcoinCoreClientSpec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ class BitcoinCoreClientSpec extends TestKitBaseClass with BitcoindService with A

implicit val formats: Formats = DefaultFormats

val defaultAddressType_opt: Option[String] = Some("bech32")
val defaultAddressType_opt: Option[String] = Some("bech32m")

override def beforeAll(): Unit = {
// Note that we don't specify a default change address type, allowing bitcoind to choose between p2wpkh and p2tr.
Expand Down Expand Up @@ -90,10 +90,10 @@ class BitcoinCoreClientSpec extends TestKitBaseClass with BitcoindService with A
val sender = TestProbe()
val bitcoinClient = makeBitcoinCoreClient()

// wallet is configured with address_type=bech32
// wallet is configured with address_type=bech32m
bitcoinClient.getReceiveAddress(None).pipeTo(sender.ref)
val address = sender.expectMsgType[String]
assert(addressToPublicKeyScript(Block.RegtestGenesisBlock.hash, address).map(Script.isPay2wpkh).contains(true))
assert(addressToPublicKeyScript(Block.RegtestGenesisBlock.hash, address).map(Script.isPay2tr).contains(true))

bitcoinClient.getReceiveAddress(Some(AddressType.P2wpkh)).pipeTo(sender.ref)
val address1 = sender.expectMsgType[String]
Expand All @@ -108,10 +108,10 @@ class BitcoinCoreClientSpec extends TestKitBaseClass with BitcoindService with A
val sender = TestProbe()
val bitcoinClient = makeBitcoinCoreClient()

// wallet is configured with address_type=bech32
// wallet is configured with address_type=bech32m
bitcoinClient.getChangeAddress(None).pipeTo(sender.ref)
val address = sender.expectMsgType[String]
assert(addressToPublicKeyScript(Block.RegtestGenesisBlock.hash, address).map(Script.isPay2wpkh).contains(true))
assert(addressToPublicKeyScript(Block.RegtestGenesisBlock.hash, address).map(Script.isPay2tr).contains(true))

bitcoinClient.getChangeAddress(Some(AddressType.P2wpkh)).pipeTo(sender.ref)
val address1 = sender.expectMsgType[String]
Expand Down Expand Up @@ -1746,11 +1746,11 @@ class BitcoinCoreClientSpec extends TestKitBaseClass with BitcoindService with A
val sender = TestProbe()
val bitcoinClient = makeBitcoinCoreClient()

// eclair on-chain key manager does not yet support taproot descriptors
// eclair on-chain key manager supports taproot descriptors
bitcoinClient.getReceiveAddress().pipeTo(sender.ref)
val defaultAddress = sender.expectMsgType[String]
val decoded = Bech32.decodeWitnessAddress(defaultAddress)
assert(decoded.getSecond == 0)
assert(decoded.getSecond == 1)

// But we can explicitly use segwit v0 addresses.
bitcoinClient.getP2wpkhPubkey().pipeTo(sender.ref)
Expand Down Expand Up @@ -2015,13 +2015,13 @@ class BitcoinCoreClientWithEclairSignerSpec extends BitcoinCoreClientSpec {
assert(wallet.onChainKeyManager_opt.get.masterPubKey(0, AddressType.P2wpkh) == accountXPub)

(0 to 10).foreach { _ =>
wallet.getReceiveAddress().pipeTo(sender.ref)
wallet.getReceiveAddress(Some(AddressType.P2wpkh)).pipeTo(sender.ref)
val address = sender.expectMsgType[String]
val bip32path = getBip32Path(wallet, address, sender)
assert(bip32path.path.length == 5 && bip32path.toString().startsWith("m/84'/1'/0'/0"))
assert(computeBIP84Address(master.derivePrivateKey(bip32path).publicKey, Block.RegtestGenesisBlock.hash) == address)

wallet.getChangeAddress().pipeTo(sender.ref)
wallet.getChangeAddress(Some(AddressType.P2wpkh)).pipeTo(sender.ref)
val changeAddress = sender.expectMsgType[String]
val bip32ChangePath = getBip32Path(wallet, changeAddress, sender)
assert(bip32ChangePath.path.length == 5 && bip32ChangePath.toString().startsWith("m/84'/1'/0'/1"))
Expand Down
6 changes: 3 additions & 3 deletions eclair-core/src/test/scala/fr/acinq/eclair/blockchain/bitcoind/BitcoindService.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,8 +89,8 @@ trait BitcoindService extends Logging {
val onChainKeyManager = new LocalOnChainKeyManager("eclair", MnemonicCode.toSeed(mnemonics, passphrase), TimestampSecond.now(), Block.RegtestGenesisBlock.hash)

def startBitcoind(useCookie: Boolean = false,
defaultAddressType_opt: Option[String] = None,
changeAddressType_opt: Option[String] = None,
defaultAddressType_opt: Option[String] = Some("bech32m"),
changeAddressType_opt: Option[String] = Some("bech32m"),
mempoolSize_opt: Option[Int] = None, // mempool size in MB
mempoolMinFeerate_opt: Option[FeeratePerByte] = None, // transactions below this feerate won't be accepted in the mempool
startupFlags: String = ""): Unit = {
Expand Down Expand Up @@ -199,7 +199,7 @@ trait BitcoindService extends Logging {
val addressToUse = address match {
case Some(addr) => addr
case None =>
sender.send(bitcoincli, BitcoinReq("getnewaddress", "", "bech32"))
sender.send(bitcoincli, BitcoinReq("getnewaddress", "", "bech32m"))
val JString(address) = sender.expectMsgType[JValue](timeout)
address
}
Expand Down
10 changes: 5 additions & 5 deletions eclair-core/src/test/scala/fr/acinq/eclair/channel/InteractiveTxBuilderSpec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ class InteractiveTxBuilderSpec extends TestKitBaseClass with AnyFunSuiteLike wit
}

private def createInput(channelId: ByteVector32, serialId: UInt64, amount: Satoshi): TxAddInput = {
val changeScript = Script.write(Script.pay2wpkh(randomKey().publicKey))
val changeScript = Script.write(Script.pay2tr(randomKey().publicKey.xOnly))
val previousTx = Transaction(2, Nil, Seq(TxOut(amount, changeScript), TxOut(amount, changeScript), TxOut(amount, changeScript)), 0)
TxAddInput(channelId, serialId, Some(previousTx), 1, 0)
}
Expand Down Expand Up @@ -1463,7 +1463,7 @@ class InteractiveTxBuilderSpec extends TestKitBaseClass with AnyFunSuiteLike wit
}

test("fund transaction with previous inputs (with new inputs)") {
val targetFeerate = FeeratePerKw(10_000 sat)
val targetFeerate = FeeratePerKw(11_000 sat)
val fundingA = 100_000 sat
val utxosA = Seq(55_000 sat, 55_000 sat, 55_000 sat)
withFixture(ChannelTypes.AnchorOutputsZeroFeeHtlcTx(), fundingA, utxosA, 0 sat, Nil, targetFeerate, 660 sat, 0, RequireConfirmedInputs(forLocal = false, forRemote = false)) { f =>
Expand Down Expand Up @@ -1576,7 +1576,7 @@ class InteractiveTxBuilderSpec extends TestKitBaseClass with AnyFunSuiteLike wit
val successA1 = alice2bob.expectMsgType[Succeeded]
val successB1 = bob2alice.expectMsgType[Succeeded]
val (txA1, commitmentA1, txB1, commitmentB1) = fixtureParams.exchangeSigsBobFirst(bobParams, successA1, successB1)
assert(initialFeerate * 0.9 <= txA1.feerate && txA1.feerate <= initialFeerate * 1.25)
assert(initialFeerate * 0.9 <= txA1.feerate && txA1.feerate <= initialFeerate * 1.3)
val probe = TestProbe()
walletA.publishTransaction(txA1.signedTx).pipeTo(probe.ref)
probe.expectMsg(txA1.txId)
Expand Down Expand Up @@ -1919,7 +1919,7 @@ class InteractiveTxBuilderSpec extends TestKitBaseClass with AnyFunSuiteLike wit
val successA1 = alice2bob.expectMsgType[Succeeded]
val successB1 = bob2alice.expectMsgType[Succeeded]
val (txA1, commitmentA1, _, commitmentB1) = fixtureParams.exchangeSigsBobFirst(bobParams, successA1, successB1)
assert(targetFeerate * 0.9 <= txA1.feerate && txA1.feerate <= targetFeerate * 1.25)
assert(targetFeerate * 0.9 <= txA1.feerate && txA1.feerate <= targetFeerate * 1.35)
walletA.publishTransaction(txA1.signedTx).pipeTo(probe.ref)
probe.expectMsg(txA1.txId)

Expand Down Expand Up @@ -1970,7 +1970,7 @@ class InteractiveTxBuilderSpec extends TestKitBaseClass with AnyFunSuiteLike wit
val (spliceTxA1, commitmentA2, _, commitmentB2) = fixtureParams.exchangeSigsBobFirst(fundingParamsB1, successA2, successB2)
assert(commitmentA2.localCommit.spec.toLocal == commitmentA1.localCommit.spec.toLocal - spliceFeeA - purchase.fees.total)
assert(commitmentB2.localCommit.spec.toLocal == commitmentB1.localCommit.spec.toLocal + fundingB + purchase.fees.total)
assert(targetFeerate * 0.9 <= spliceTxA1.feerate && spliceTxA1.feerate <= targetFeerate * 1.25)
assert(targetFeerate * 0.9 <= spliceTxA1.feerate && spliceTxA1.feerate <= targetFeerate * 1.35)
walletA.publishTransaction(spliceTxA1.signedTx).pipeTo(probe.ref)
probe.expectMsg(spliceTxA1.txId)

Expand Down
12 changes: 6 additions & 6 deletions eclair-core/src/test/scala/fr/acinq/eclair/channel/publish/ReplaceableTxPublisherSpec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -455,7 +455,7 @@ class ReplaceableTxPublisherSpec extends TestKitBaseClass with AnyFunSuiteLike w

val targetFee = Transactions.weight2fee(targetFeerate, mempoolTxs.map(_.weight).sum.toInt)
val actualFee = mempoolTxs.map(_.fees).sum
assert(targetFee * 0.9 <= actualFee && actualFee <= targetFee * 1.1, s"actualFee=$actualFee targetFee=$targetFee")
assert(targetFee * 0.9 <= actualFee && actualFee <= targetFee * 1.3, s"actualFee=$actualFee targetFee=$targetFee")

generateBlocks(6)
system.eventStream.publish(CurrentBlockHeight(currentBlockHeight(probe)))
Expand Down Expand Up @@ -500,7 +500,7 @@ class ReplaceableTxPublisherSpec extends TestKitBaseClass with AnyFunSuiteLike w

val targetFee = Transactions.weight2fee(targetFeerate, mempoolTxs.map(_.weight).sum.toInt)
val actualFee = mempoolTxs.map(_.fees).sum
assert(targetFee * 0.9 <= actualFee && actualFee <= targetFee * 1.1, s"actualFee=$actualFee targetFee=$targetFee")
assert(targetFee * 0.9 <= actualFee && actualFee <= targetFee * 1.2, s"actualFee=$actualFee targetFee=$targetFee")

generateBlocks(6)
system.eventStream.publish(CurrentBlockHeight(currentBlockHeight(probe)))
Expand Down Expand Up @@ -595,7 +595,7 @@ class ReplaceableTxPublisherSpec extends TestKitBaseClass with AnyFunSuiteLike w

val targetFee = Transactions.weight2fee(targetFeerate, mempoolTxs.map(_.weight).sum.toInt)
val actualFee = mempoolTxs.map(_.fees).sum
assert(targetFee * 0.9 <= actualFee && actualFee <= targetFee * 1.1, s"actualFee=$actualFee targetFee=$targetFee")
assert(targetFee * 0.9 <= actualFee && actualFee <= targetFee * 1.3, s"actualFee=$actualFee targetFee=$targetFee")

generateBlocks(6)
system.eventStream.publish(CurrentBlockHeight(currentBlockHeight(probe)))
Expand Down Expand Up @@ -628,7 +628,7 @@ class ReplaceableTxPublisherSpec extends TestKitBaseClass with AnyFunSuiteLike w

val targetFee = Transactions.weight2fee(targetFeerate, mempoolTxs.map(_.weight).sum.toInt)
val actualFee = mempoolTxs.map(_.fees).sum
assert(targetFee * 0.9 <= actualFee && actualFee <= targetFee * 1.1, s"actualFee=$actualFee targetFee=$targetFee")
assert(targetFee * 0.9 <= actualFee && actualFee <= targetFee * 1.3, s"actualFee=$actualFee targetFee=$targetFee")

generateBlocks(6)
system.eventStream.publish(CurrentBlockHeight(currentBlockHeight(probe)))
Expand Down Expand Up @@ -870,7 +870,7 @@ class ReplaceableTxPublisherSpec extends TestKitBaseClass with AnyFunSuiteLike w
assert(mempoolAnchorTx1.txid == anchorTxId1)
val targetFee1 = Transactions.weight2fee(feerateLow, mempoolTxs1.map(_.weight).sum.toInt)
val actualFee1 = mempoolTxs1.map(_.fees).sum
assert(targetFee1 * 0.9 <= actualFee1 && actualFee1 <= targetFee1 * 1.1, s"actualFee=$actualFee1 targetFee=$targetFee1")
assert(targetFee1 * 0.9 <= actualFee1 && actualFee1 <= targetFee1 * 1.3, s"actualFee=$actualFee1 targetFee=$targetFee1")

// The confirmation target has changed (probably because we learnt a payment preimage).
// We should now use the high feerate, which corresponds to that new target.
Expand Down Expand Up @@ -1147,7 +1147,7 @@ class ReplaceableTxPublisherSpec extends TestKitBaseClass with AnyFunSuiteLike w
setFeerate(targetFeerate) // the feerate is higher than what it was when the channel force-closed
val htlcTimeoutTx = getMempoolTxs(1).head
val htlcTimeoutTargetFee = Transactions.weight2fee(targetFeerate, htlcTimeoutTx.weight.toInt)
assert(htlcTimeoutTargetFee * 0.9 <= htlcTimeoutTx.fees && htlcTimeoutTx.fees <= htlcTimeoutTargetFee * 1.2, s"actualFee=${htlcTimeoutTx.fees} targetFee=$htlcTimeoutTargetFee")
assert(htlcTimeoutTargetFee * 0.9 <= htlcTimeoutTx.fees && htlcTimeoutTx.fees <= htlcTimeoutTargetFee * 1.3, s"actualFee=${htlcTimeoutTx.fees} targetFee=$htlcTimeoutTargetFee")
assert(htlcTimeoutTx.fees <= htlcTimeout.txInfo.amountIn)

generateBlocks(6)
Expand Down