Skip to content

Commit a34f600

Browse files
t-bastt-bast
committed
Add funding_fee_credit feature
We add an optional feature that lets on-the-fly funding clients accept payments that are too small to pay the fees for an on-the-fly funding. When that happens, the payment amount is added as "fee credit" without performing an on-chain operation. Once enough fee credit has been obtained, we can initiate an on-chain operation to create a channel or a splice by paying part of the fees from the fee credit. This feature makes more efficient use of on-chain transactions by trusting that the seller will honor our fee credit in the future. The fee credit takes precedence over other ways of paying the fees (from the channel balance or future HTLCs), which guarantees that the fee credit eventually converges to 0.
1 parent 9f1ace1 commit a34f600

22 files changed

+859
-105
lines changed

‎eclair-core/src/main/scala/fr/acinq/eclair/Features.scala‎

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -332,6 +332,14 @@ object Features {
332332
val mandatory = 560
333333
}
334334

335+
// TODO:
336+
// - add NodeFeature once stable
337+
// - add link to bLIP
338+
case object FundingFeeCredit extends Feature with InitFeature {
339+
val rfcName = "funding_fee_credit"
340+
val mandatory = 562
341+
}
342+
335343
val knownFeatures: Set[Feature] = Set(
336344
DataLossProtect,
337345
InitialRoutingSync,
@@ -358,7 +366,8 @@ object Features {
358366
TrampolinePaymentPrototype,
359367
AsyncPaymentPrototype,
360368
SplicePrototype,
361-
OnTheFlyFunding
369+
OnTheFlyFunding,
370+
FundingFeeCredit
362371
)
363372

364373
// Features may depend on other features, as specified in Bolt 9.
@@ -372,7 +381,8 @@ object Features {
372381
TrampolinePaymentPrototype -> (PaymentSecret :: Nil),
373382
KeySend -> (VariableLengthOnion :: Nil),
374383
AsyncPaymentPrototype -> (TrampolinePaymentPrototype :: Nil),
375-
OnTheFlyFunding -> (SplicePrototype :: Nil)
384+
OnTheFlyFunding -> (SplicePrototype :: Nil),
385+
FundingFeeCredit -> (OnTheFlyFunding :: Nil)
376386
)
377387

378388
case class FeatureException(message: String) extends IllegalArgumentException(message)

‎eclair-core/src/main/scala/fr/acinq/eclair/channel/Helpers.scala‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ object Helpers {
171171

172172
for {
173173
script_opt <- extractShutdownScript(open.temporaryChannelId, localFeatures, remoteFeatures, open.upfrontShutdownScript_opt)
174-
willFund_opt <- LiquidityAds.validateRequest(nodeParams.privateKey, open.temporaryChannelId, fundingScript, open.fundingFeerate, isChannelCreation = true, open.requestFunding_opt, addFunding_opt.flatMap(_.rates_opt))
174+
willFund_opt <- LiquidityAds.validateRequest(nodeParams.privateKey, open.temporaryChannelId, fundingScript, open.fundingFeerate, isChannelCreation = true, open.requestFunding_opt, addFunding_opt.flatMap(_.rates_opt), open.useFeeCredit_opt)
175175
} yield (channelFeatures, script_opt, willFund_opt)
176176
}
177177

‎eclair-core/src/main/scala/fr/acinq/eclair/channel/fsm/Channel.scala‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -952,7 +952,7 @@ class Channel(val nodeParams: NodeParams, val wallet: OnChainChannelFunder with
952952
val parentCommitment = d.commitments.latest.commitment
953953
val localFundingPubKey = nodeParams.channelKeyManager.fundingPublicKey(d.commitments.params.localParams.fundingKeyPath, parentCommitment.fundingTxIndex + 1).publicKey
954954
val fundingScript = Funding.makeFundingPubKeyScript(localFundingPubKey, msg.fundingPubKey)
955-
LiquidityAds.validateRequest(nodeParams.privateKey, d.channelId, fundingScript, msg.feerate, isChannelCreation = false, msg.requestFunding_opt, nodeParams.willFundRates_opt) match {
955+
LiquidityAds.validateRequest(nodeParams.privateKey, d.channelId, fundingScript, msg.feerate, isChannelCreation = false, msg.requestFunding_opt, nodeParams.willFundRates_opt, msg.useFeeCredit_opt) match {
956956
case Left(t) =>
957957
log.warning("rejecting splice request with invalid liquidity ads: {}", t.getMessage)
958958
stay() using d.copy(spliceStatus = SpliceStatus.SpliceAborted) sending TxAbort(d.channelId, t.getMessage)
@@ -963,7 +963,8 @@ class Channel(val nodeParams: NodeParams, val wallet: OnChainChannelFunder with
963963
fundingPubKey = localFundingPubKey,
964964
pushAmount = 0.msat,
965965
requireConfirmedInputs = nodeParams.channelConf.requireConfirmedInputsForDualFunding,
966-
willFund_opt = willFund_opt.map(_.willFund)
966+
willFund_opt = willFund_opt.map(_.willFund),
967+
feeCreditUsed_opt = msg.useFeeCredit_opt
967968
)
968969
val fundingParams = InteractiveTxParams(
969970
channelId = d.channelId,

‎eclair-core/src/main/scala/fr/acinq/eclair/channel/fsm/ChannelOpenDualFunded.scala‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,6 +180,7 @@ trait ChannelOpenDualFunded extends DualFundingHandlers with ErrorHandlers {
180180
Some(ChannelTlv.ChannelTypeTlv(d.init.channelType)),
181181
if (d.init.requireConfirmedInputs) Some(ChannelTlv.RequireConfirmedInputsTlv()) else None,
182182
willFund_opt.map(l => ChannelTlv.ProvideFundingTlv(l.willFund)),
183+
open.useFeeCredit_opt.map(c => ChannelTlv.FeeCreditUsedTlv(c)),
183184
d.init.pushAmount_opt.map(amount => ChannelTlv.PushAmountTlv(amount)),
184185
).flatten
185186
val accept = AcceptDualFundedChannel(
@@ -547,7 +548,7 @@ trait ChannelOpenDualFunded extends DualFundingHandlers with ErrorHandlers {
547548
stay() using d.copy(rbfStatus = RbfStatus.RbfAborted) sending TxAbort(d.channelId, InvalidRbfAttemptTooSoon(d.channelId, d.latestFundingTx.createdAt, d.latestFundingTx.createdAt + nodeParams.channelConf.remoteRbfLimits.attemptDeltaBlocks).getMessage)
548549
} else {
549550
val fundingScript = d.commitments.latest.commitInput.txOut.publicKeyScript
550-
LiquidityAds.validateRequest(nodeParams.privateKey, d.channelId, fundingScript, msg.feerate, isChannelCreation = true, msg.requestFunding_opt, nodeParams.willFundRates_opt) match {
551+
LiquidityAds.validateRequest(nodeParams.privateKey, d.channelId, fundingScript, msg.feerate, isChannelCreation = true, msg.requestFunding_opt, nodeParams.willFundRates_opt, None) match {
551552
case Left(t) =>
552553
log.warning("rejecting rbf attempt: invalid liquidity ads request ({})", t.getMessage)
553554
stay() using d.copy(rbfStatus = RbfStatus.RbfAborted) sending TxAbort(d.channelId, t.getMessage)

‎eclair-core/src/main/scala/fr/acinq/eclair/channel/fund/InteractiveTxBuilder.scala‎

Lines changed: 20 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ import fr.acinq.eclair.crypto.keymanager.ChannelKeyManager
3737
import fr.acinq.eclair.transactions.Transactions.{CommitTx, HtlcTx, InputInfo, TxOwner}
3838
import fr.acinq.eclair.transactions.{CommitmentSpec, DirectedHtlc, Scripts, Transactions}
3939
import fr.acinq.eclair.wire.protocol._
40-
import fr.acinq.eclair.{Logs, MilliSatoshi, MilliSatoshiLong, NodeParams, UInt64}
40+
import fr.acinq.eclair.{Logs, MilliSatoshi, MilliSatoshiLong, NodeParams, ToMilliSatoshiConversion, UInt64}
4141
import scodec.bits.ByteVector
4242

4343
import scala.concurrent.{ExecutionContext, Future}
@@ -157,13 +157,18 @@ object InteractiveTxBuilder {
157157
// BOLT 2: the initiator's serial IDs MUST use even values and the non-initiator odd values.
158158
val serialIdParity: Int = if (isInitiator) 0 else 1
159159

160-
def liquidityFees(liquidityPurchase_opt: Option[LiquidityAds.Purchase]): Satoshi = {
160+
def liquidityFees(liquidityPurchase_opt: Option[LiquidityAds.Purchase]): MilliSatoshi = {
161161
liquidityPurchase_opt.map(l => l.paymentDetails match {
162162
// The initiator of the interactive-tx is the liquidity buyer (if liquidity ads is used).
163-
case LiquidityAds.PaymentDetails.FromChannelBalance | _: LiquidityAds.PaymentDetails.FromChannelBalanceForFutureHtlc => if (isInitiator) l.fees.total else -l.fees.total
163+
case LiquidityAds.PaymentDetails.FromChannelBalance | _: LiquidityAds.PaymentDetails.FromChannelBalanceForFutureHtlc =>
164+
val feesOwed = l match {
165+
case l: LiquidityAds.Purchase.Standard => l.fees.total.toMilliSatoshi
166+
case l: LiquidityAds.Purchase.WithFeeCredit => l.fees.total.toMilliSatoshi - l.feeCreditUsed
167+
}
168+
if (isInitiator) feesOwed else -feesOwed
164169
// Fees will be paid later, when relaying HTLCs.
165-
case _: LiquidityAds.PaymentDetails.FromFutureHtlc | _: LiquidityAds.PaymentDetails.FromFutureHtlcWithPreimage => 0.sat
166-
}).getOrElse(0 sat)
170+
case _: LiquidityAds.PaymentDetails.FromFutureHtlc | _: LiquidityAds.PaymentDetails.FromFutureHtlcWithPreimage => 0 msat
171+
}).getOrElse(0 msat)
167172
}
168173
}
169174

@@ -744,6 +749,16 @@ private class InteractiveTxBuilder(replyTo: ActorRef[InteractiveTxBuilder.Respon
744749
return Left(InvalidCompleteInteractiveTx(fundingParams.channelId))
745750
}
746751

752+
liquidityPurchase_opt match {
753+
case Some(p: LiquidityAds.Purchase.WithFeeCredit) if !fundingParams.isInitiator =>
754+
val currentFeeCredit = nodeParams.db.onTheFlyFunding.getFeeCredit(remoteNodeId)
755+
if (currentFeeCredit < p.feeCreditUsed) {
756+
log.warn("not enough fee credit: our peer may be malicious ({} < {})", currentFeeCredit, p.feeCreditUsed)
757+
return Left(InvalidCompleteInteractiveTx(fundingParams.channelId))
758+
}
759+
case _ => ()
760+
}
761+
747762
previousTransactions.headOption match {
748763
case Some(previousTx) =>
749764
// This is an RBF attempt: even if our peer does not contribute to the feerate increase, we'd like to broadcast

‎eclair-core/src/main/scala/fr/acinq/eclair/db/DualDatabases.scala‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -457,4 +457,19 @@ case class DualOnTheFlyFundingDb(primary: OnTheFlyFundingDb, secondary: OnTheFly
457457
runAsync(secondary.listPendingPayments())
458458
primary.listPendingPayments()
459459
}
460+
461+
override def addFeeCredit(nodeId: PublicKey, amount: MilliSatoshi, receivedAt: TimestampMilli): MilliSatoshi = {
462+
runAsync(secondary.addFeeCredit(nodeId, amount, receivedAt))
463+
primary.addFeeCredit(nodeId, amount, receivedAt)
464+
}
465+
466+
override def getFeeCredit(nodeId: PublicKey): MilliSatoshi = {
467+
runAsync(secondary.getFeeCredit(nodeId))
468+
primary.getFeeCredit(nodeId)
469+
}
470+
471+
override def removeFeeCredit(nodeId: PublicKey, amountUsed: MilliSatoshi): MilliSatoshi = {
472+
runAsync(secondary.removeFeeCredit(nodeId, amountUsed))
473+
primary.removeFeeCredit(nodeId, amountUsed)
474+
}
460475
}

‎eclair-core/src/main/scala/fr/acinq/eclair/db/OnTheFlyFundingDb.scala‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ package fr.acinq.eclair.db
1818

1919
import fr.acinq.bitcoin.scalacompat.ByteVector32
2020
import fr.acinq.bitcoin.scalacompat.Crypto.PublicKey
21+
import fr.acinq.eclair.{MilliSatoshi, TimestampMilli}
2122
import fr.acinq.eclair.payment.relay.OnTheFlyFunding
2223

2324
/**
@@ -47,4 +48,13 @@ trait OnTheFlyFundingDb {
4748
/** List the payment_hashes of pending proposals we funded for all remote nodes. */
4849
def listPendingPayments(): Map[PublicKey, Set[ByteVector32]]
4950

51+
/** Add fee credit for the given remote node and return the updated fee credit. */
52+
def addFeeCredit(nodeId: PublicKey, amount: MilliSatoshi, receivedAt: TimestampMilli = TimestampMilli.now()): MilliSatoshi
53+
54+
/** Return the amount owed to the given remote node as fee credit. */
55+
def getFeeCredit(nodeId: PublicKey): MilliSatoshi
56+
57+
/** Remove fee credit for the given remote node and return the remaining fee credit. */
58+
def removeFeeCredit(nodeId: PublicKey, amountUsed: MilliSatoshi): MilliSatoshi
59+
5060
}

‎eclair-core/src/main/scala/fr/acinq/eclair/db/pg/PgOnTheFlyFundingDb.scala‎

Lines changed: 42 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@ package fr.acinq.eclair.db.pg
1818

1919
import fr.acinq.bitcoin.scalacompat.Crypto.PublicKey
2020
import fr.acinq.bitcoin.scalacompat.{ByteVector32, Crypto, TxId}
21-
import fr.acinq.eclair.MilliSatoshiLong
2221
import fr.acinq.eclair.db.Monitoring.Metrics.withMetrics
2322
import fr.acinq.eclair.db.Monitoring.Tags.DbBackends
2423
import fr.acinq.eclair.db.OnTheFlyFundingDb
2524
import fr.acinq.eclair.db.pg.PgUtils.PgLock
2625
import fr.acinq.eclair.payment.relay.OnTheFlyFunding
26+
import fr.acinq.eclair.{MilliSatoshi, MilliSatoshiLong, TimestampMilli}
2727
import scodec.bits.BitVector
2828

2929
import java.sql.Timestamp
@@ -53,6 +53,7 @@ class PgOnTheFlyFundingDb(implicit ds: DataSource, lock: PgLock) extends OnTheFl
5353
statement.executeUpdate("CREATE SCHEMA IF NOT EXISTS on_the_fly_funding")
5454
statement.executeUpdate("CREATE TABLE on_the_fly_funding.preimages (payment_hash TEXT NOT NULL PRIMARY KEY, preimage TEXT NOT NULL, received_at TIMESTAMP WITH TIME ZONE NOT NULL)")
5555
statement.executeUpdate("CREATE TABLE on_the_fly_funding.pending (remote_node_id TEXT NOT NULL, payment_hash TEXT NOT NULL, channel_id TEXT NOT NULL, tx_id TEXT NOT NULL, funding_tx_index BIGINT NOT NULL, remaining_fees_msat BIGINT NOT NULL, proposed BYTEA NOT NULL, funded_at TIMESTAMP WITH TIME ZONE NOT NULL, PRIMARY KEY (remote_node_id, payment_hash))")
56+
statement.executeUpdate("CREATE TABLE on_the_fly_funding.fee_credit (remote_node_id TEXT NOT NULL PRIMARY KEY, amount_msat BIGINT NOT NULL, updated_at TIMESTAMP WITH TIME ZONE NOT NULL)")
5657
case Some(CURRENT_VERSION) => () // table is up-to-date, nothing to do
5758
case Some(unknownVersion) => throw new RuntimeException(s"Unknown version of DB $DB_NAME found, version=$unknownVersion")
5859
}
@@ -83,6 +84,7 @@ class PgOnTheFlyFundingDb(implicit ds: DataSource, lock: PgLock) extends OnTheFl
8384
override def addPending(remoteNodeId: Crypto.PublicKey, pending: OnTheFlyFunding.Pending): Unit = withMetrics("on-the-fly-funding/add-pending", DbBackends.Postgres) {
8485
pending.status match {
8586
case _: OnTheFlyFunding.Status.Proposed => ()
87+
case _: OnTheFlyFunding.Status.AddedToFeeCredit => ()
8688
case status: OnTheFlyFunding.Status.Funded => withLock { pg =>
8789
using(pg.prepareStatement("INSERT INTO on_the_fly_funding.pending (remote_node_id, payment_hash, channel_id, tx_id, funding_tx_index, remaining_fees_msat, proposed, funded_at) VALUES (?, ?, ?, ?, ?, ?, ?, ?) ON CONFLICT DO NOTHING")) { statement =>
8890
statement.setString(1, remoteNodeId.toHex)
@@ -171,4 +173,43 @@ class PgOnTheFlyFundingDb(implicit ds: DataSource, lock: PgLock) extends OnTheFl
171173
}
172174
}
173175

176+
override def addFeeCredit(nodeId: PublicKey, amount: MilliSatoshi, receivedAt: TimestampMilli): MilliSatoshi = withMetrics("on-the-fly-funding/add-fee-credit", DbBackends.Postgres) {
177+
withLock { pg =>
178+
using(pg.prepareStatement("INSERT INTO on_the_fly_funding.fee_credit(remote_node_id, amount_msat, updated_at) VALUES (?, ?, ?) ON CONFLICT (remote_node_id) DO UPDATE SET (amount_msat, updated_at) = (on_the_fly_funding.fee_credit.amount_msat + EXCLUDED.amount_msat, EXCLUDED.updated_at) RETURNING amount_msat")) { statement =>
179+
statement.setString(1, nodeId.toHex)
180+
statement.setLong(2, amount.toLong)
181+
statement.setTimestamp(3, receivedAt.toSqlTimestamp)
182+
statement.executeQuery().map(_.getLong("amount_msat").msat).headOption.getOrElse(0 msat)
183+
}
184+
}
185+
}
186+
187+
override def getFeeCredit(nodeId: PublicKey): MilliSatoshi = withMetrics("on-the-fly-funding/get-fee-credit", DbBackends.Postgres) {
188+
withLock { pg =>
189+
using(pg.prepareStatement("SELECT amount_msat FROM on_the_fly_funding.fee_credit WHERE remote_node_id = ?")) { statement =>
190+
statement.setString(1, nodeId.toHex)
191+
statement.executeQuery().map(_.getLong("amount_msat").msat).headOption.getOrElse(0 msat)
192+
}
193+
}
194+
}
195+
196+
override def removeFeeCredit(nodeId: PublicKey, amountUsed: MilliSatoshi): MilliSatoshi = withMetrics("on-the-fly-funding/remove-fee-credit", DbBackends.Postgres) {
197+
withLock { pg =>
198+
using(pg.prepareStatement("SELECT amount_msat FROM on_the_fly_funding.fee_credit WHERE remote_node_id = ?")) { statement =>
199+
statement.setString(1, nodeId.toHex)
200+
statement.executeQuery().map(_.getLong("amount_msat").msat).headOption match {
201+
case Some(current) => using(pg.prepareStatement("UPDATE on_the_fly_funding.fee_credit SET (amount_msat, updated_at) = (?, ?) WHERE remote_node_id = ?")) { statement =>
202+
val updated = (current - amountUsed).max(0 msat)
203+
statement.setLong(1, updated.toLong)
204+
statement.setTimestamp(2, Timestamp.from(Instant.now()))
205+
statement.setString(3, nodeId.toHex)
206+
statement.executeUpdate()
207+
updated
208+
}
209+
case None => 0 msat
210+
}
211+
}
212+
}
213+
}
214+
174215
}

‎eclair-core/src/main/scala/fr/acinq/eclair/db/sqlite/SqliteOnTheFlyFundingDb.scala‎

Lines changed: 49 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import fr.acinq.eclair.db.Monitoring.Metrics.withMetrics
2222
import fr.acinq.eclair.db.Monitoring.Tags.DbBackends
2323
import fr.acinq.eclair.db.OnTheFlyFundingDb
2424
import fr.acinq.eclair.payment.relay.OnTheFlyFunding
25-
import fr.acinq.eclair.{MilliSatoshiLong, TimestampMilli}
25+
import fr.acinq.eclair.{MilliSatoshi, MilliSatoshiLong, TimestampMilli}
2626
import scodec.bits.BitVector
2727

2828
import java.sql.Connection
@@ -47,6 +47,7 @@ class SqliteOnTheFlyFundingDb(val sqlite: Connection) extends OnTheFlyFundingDb
4747
case None =>
4848
statement.executeUpdate("CREATE TABLE on_the_fly_funding_preimages (payment_hash BLOB NOT NULL PRIMARY KEY, preimage BLOB NOT NULL, received_at INTEGER NOT NULL)")
4949
statement.executeUpdate("CREATE TABLE on_the_fly_funding_pending (remote_node_id BLOB NOT NULL, payment_hash BLOB NOT NULL, channel_id BLOB NOT NULL, tx_id BLOB NOT NULL, funding_tx_index INTEGER NOT NULL, remaining_fees_msat INTEGER NOT NULL, proposed BLOB NOT NULL, funded_at INTEGER NOT NULL, PRIMARY KEY (remote_node_id, payment_hash))")
50+
statement.executeUpdate("CREATE TABLE fee_credit (remote_node_id BLOB NOT NULL PRIMARY KEY, amount_msat INTEGER NOT NULL, updated_at INTEGER NOT NULL)")
5051
case Some(CURRENT_VERSION) => () // table is up-to-date, nothing to do
5152
case Some(unknownVersion) => throw new RuntimeException(s"Unknown version of DB $DB_NAME found, version=$unknownVersion")
5253
}
@@ -72,6 +73,7 @@ class SqliteOnTheFlyFundingDb(val sqlite: Connection) extends OnTheFlyFundingDb
7273
override def addPending(remoteNodeId: Crypto.PublicKey, pending: OnTheFlyFunding.Pending): Unit = withMetrics("on-the-fly-funding/add-pending", DbBackends.Sqlite) {
7374
pending.status match {
7475
case _: OnTheFlyFunding.Status.Proposed => ()
76+
case _: OnTheFlyFunding.Status.AddedToFeeCredit => ()
7577
case status: OnTheFlyFunding.Status.Funded =>
7678
using(sqlite.prepareStatement("INSERT OR IGNORE INTO on_the_fly_funding_pending (remote_node_id, payment_hash, channel_id, tx_id, funding_tx_index, remaining_fees_msat, proposed, funded_at) VALUES (?, ?, ?, ?, ?, ?, ?, ?)")) { statement =>
7779
statement.setBytes(1, remoteNodeId.value.toArray)
@@ -151,4 +153,50 @@ class SqliteOnTheFlyFundingDb(val sqlite: Connection) extends OnTheFlyFundingDb
151153
}
152154
}
153155

156+
override def addFeeCredit(nodeId: PublicKey, amount: MilliSatoshi, receivedAt: TimestampMilli): MilliSatoshi = withMetrics("on-the-fly-funding/add-fee-credit", DbBackends.Sqlite) {
157+
using(sqlite.prepareStatement("SELECT amount_msat FROM fee_credit WHERE remote_node_id = ?")) { statement =>
158+
statement.setBytes(1, nodeId.value.toArray)
159+
statement.executeQuery().map(_.getLong("amount_msat").msat).headOption match {
160+
case Some(current) => using(sqlite.prepareStatement("UPDATE fee_credit SET (amount_msat, updated_at) = (?, ?) WHERE remote_node_id = ?")) { statement =>
161+
statement.setLong(1, (current + amount).toLong)
162+
statement.setLong(2, receivedAt.toLong)
163+
statement.setBytes(3, nodeId.value.toArray)
164+
statement.executeUpdate()
165+
amount + current
166+
}
167+
case None => using(sqlite.prepareStatement("INSERT OR IGNORE INTO fee_credit(remote_node_id, amount_msat, updated_at) VALUES (?, ?, ?)")) { statement =>
168+
statement.setBytes(1, nodeId.value.toArray)
169+
statement.setLong(2, amount.toLong)
170+
statement.setLong(3, receivedAt.toLong)
171+
statement.executeUpdate()
172+
amount
173+
}
174+
}
175+
}
176+
}
177+
178+
override def getFeeCredit(nodeId: PublicKey): MilliSatoshi = withMetrics("on-the-fly-funding/get-fee-credit", DbBackends.Sqlite) {
179+
using(sqlite.prepareStatement("SELECT amount_msat FROM fee_credit WHERE remote_node_id = ?")) { statement =>
180+
statement.setBytes(1, nodeId.value.toArray)
181+
statement.executeQuery().map(_.getLong("amount_msat").msat).headOption.getOrElse(0 msat)
182+
}
183+
}
184+
185+
override def removeFeeCredit(nodeId: PublicKey, amountUsed: MilliSatoshi): MilliSatoshi = withMetrics("on-the-fly-funding/remove-fee-credit", DbBackends.Sqlite) {
186+
using(sqlite.prepareStatement("SELECT amount_msat FROM fee_credit WHERE remote_node_id = ?")) { statement =>
187+
statement.setBytes(1, nodeId.value.toArray)
188+
statement.executeQuery().map(_.getLong("amount_msat").msat).headOption match {
189+
case Some(current) => using(sqlite.prepareStatement("UPDATE fee_credit SET (amount_msat, updated_at) = (?, ?) WHERE remote_node_id = ?")) { statement =>
190+
val updated = (current - amountUsed).max(0 msat)
191+
statement.setLong(1, updated.toLong)
192+
statement.setLong(2, TimestampMilli.now().toLong)
193+
statement.setBytes(3, nodeId.value.toArray)
194+
statement.executeUpdate()
195+
updated
196+
}
197+
case None => 0 msat
198+
}
199+
}
200+
}
201+
154202
}

‎eclair-core/src/main/scala/fr/acinq/eclair/io/Monitoring.scala‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@ object Monitoring {
7575
val Rejected = "rejected"
7676
val Expired = "expired"
7777
val Timeout = "timeout"
78+
val AddedToFeeCredit = "added-to-fee-credit"
7879
val Funded = "funded"
7980
val RelaySucceeded = "relay-succeeded"
8081

0 commit comments

Comments
 (0)