mirrors/eclair
1
0
Fork 0
mirror of https://github.com/ACINQ/eclair.git synced 2025-02-22 14:22:39 +01:00
Code Issues Projects Releases Wiki Activity

wallet: send confidence event as soon as a tx is confirmed

Browse source
This commit is contained in:
sstone 2017-11-17 17:01:13 +01:00
parent d6fcd5f13d
commit 5985148f2f
2 changed files with 54 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
eclair-core/src/main/scala/fr/acinq/eclair/blockchain/electrum/ElectrumWallet.scala
View file

@ -67,9 +67,6 @@ class ElectrumWallet(mnemonics: Seq[String], client: ActorRef, params: ElectrumW
case Event(ElectrumClient.HeaderSubscriptionResponse(header), data) =>
log.info(s"got new tip ${header.block_hash} at ${header.block_height}")
data.heights.collect {
case (txid, height) if height > 0 => statusListeners.map(_ ! WalletTransactionConfidenceChanged(txid, header.block_height - height + 1))
}
stay using data.copy(tip = header)
case Event(ElectrumClient.ScriptHashSubscriptionResponse(scriptHash, status), data) if data.status.get(scriptHash) == Some(status) => stay // we already have it
@ -119,6 +116,20 @@ class ElectrumWallet(mnemonics: Seq[String], client: ActorRef, params: ElectrumW
// otherwise we just update the height
(heights + (item.tx_hash -> item.height), hashes)
}
// we now have updated height for all our transactions, tell our listeners that their confidence hash changed
// we skip transactions for which height = 0 which means they're still unconfirmed
// workflow is:
// client ---- header update ----> wallet
// client ---- status update ----> wallet
// client <--- ask history ----> wallet
// client ---- history ----> wallet
// so our tip (header.block_height) be up-to-date and our number of confirmation should be correct
heights1.collect {
case (txid, height) if height > 0 =>
log.info(s"tx=$txid has height $height and we're at ${data.tip.block_height}")
statusListeners.map(_ ! WalletTransactionConfidenceChanged(txid, data.tip.block_height - height + 1))
}
val data1 = data.copy(heights = heights1, history = data.history + (scriptHash -> history), pendingHistoryRequests = data.pendingHistoryRequests - scriptHash, pendingTransactionRequests = pendingTransactionRequests1)
goto(stateName) using data1 // goto instead of stay because we want to fire transitions

44
eclair-core/src/test/scala/fr/acinq/eclair/blockchain/electrum/ElectrumWalletSpec.scala
View file

@ -3,7 +3,7 @@ package fr.acinq.eclair.blockchain.electrum
import akka.actor.{ActorRef, Props}
import akka.testkit.TestProbe
import fr.acinq.bitcoin._
import fr.acinq.eclair.blockchain.electrum.ElectrumClient.{BroadcastTransaction, BroadcastTransactionResponse}
import fr.acinq.eclair.blockchain.electrum.ElectrumClient.{AddStatusListener, BroadcastTransaction, BroadcastTransactionResponse}
import org.json4s.JsonAST._
import scala.concurrent.duration._
@ -30,7 +30,7 @@ class ElectrumWalletSpec extends IntegrationSpec{
logger.info(s"wallet is ready")
}
test("receive funds") {
ignore("receive funds") {
val probe = TestProbe()
probe.send(wallet, GetCurrentReceiveAddress)
@ -75,6 +75,42 @@ class ElectrumWalletSpec extends IntegrationSpec{
}, max = 30 seconds, interval = 1 second)
}
test("receive 'confidence changed' notification") {
val probe = TestProbe()
val listener = TestProbe()
listener.send(wallet, AddStatusListener(listener.ref))
probe.send(wallet, GetCurrentReceiveAddress)
val GetCurrentReceiveAddressResponse(address) = probe.expectMsgType[GetCurrentReceiveAddressResponse]
probe.send(wallet, GetBalance)
val GetBalanceResponse(confirmed, unconfirmed) = probe.expectMsgType[GetBalanceResponse]
logger.info(s"sending 1 btc to $address")
probe.send(bitcoincli, BitcoinReq("sendtoaddress", address :: 1.0 :: Nil))
val JString(txid) = probe.expectMsgType[JValue]
logger.info(s"$txid send 1 btc to us at $address")
val WalletTransactionReceive(tx, 0, received, sent, _) = listener.receiveOne(5 seconds)
assert(tx.txid === BinaryData(txid))
assert(received === Satoshi(100000000))
probe.send(bitcoincli, BitcoinReq("generate", 1 :: Nil))
probe.expectMsgType[JValue]
awaitCond({
probe.send(wallet, GetBalance)
val GetBalanceResponse(confirmed1, unconfirmed1) = probe.expectMsgType[GetBalanceResponse]
confirmed1 - confirmed == Satoshi(100000000L)
}, max = 30 seconds, interval = 1 second)
awaitCond({
val msg = listener.receiveOne(5 seconds)
msg == WalletTransactionConfidenceChanged(BinaryData(txid),1)
}, max = 30 seconds, interval = 1 second)
}
test("send money to someone else (we broadcast)") {
val probe = TestProbe()
probe.send(bitcoincli, BitcoinReq("getnewaddress"))
@ -141,7 +177,7 @@ class ElectrumWalletSpec extends IntegrationSpec{
}, max = 30 seconds, interval = 1 second)
}
test("handle reorgs (pending receive)") {
ignore("handle reorgs (pending receive)") {
val probe = TestProbe()
probe.send(wallet, GetBalance)
@ -194,7 +230,7 @@ class ElectrumWalletSpec extends IntegrationSpec{
}, max = 30 seconds, interval = 1 second)
}
test("handle reorgs (pending send)") {
ignore("handle reorgs (pending send)") {
val probe = TestProbe()
probe.send(bitcoincli, BitcoinReq("getnewaddress"))
val JString(address) = probe.expectMsgType[JValue]