Use official liquidity ads types

Update our codecs to use the official version of the liquidity ads messages and fields. The specification can be found here: lightning/bolts#1153.
ACINQ · Oct 10, 2024 · 9fe82b0 · 9fe82b0
1 parent 1b749e1
commit 9fe82b0
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 32 deletions.
diff --git a/eclair-core/src/main/scala/fr/acinq/eclair/wire/protocol/ChannelTlv.scala b/eclair-core/src/main/scala/fr/acinq/eclair/wire/protocol/ChannelTlv.scala
@@ -120,8 +120,7 @@ object OpenDualFundedChannelTlv {
     .typecase(UInt64(0), upfrontShutdownScriptCodec)
     .typecase(UInt64(1), channelTypeCodec)
     .typecase(UInt64(2), requireConfirmedInputsCodec)
-    // We use a temporary TLV while the spec is being reviewed.
-    .typecase(UInt64(1339), requestFundingCodec)
+    .typecase(UInt64(5), requestFundingCodec)
     .typecase(UInt64(0x47000007), pushAmountCodec)
   )
 }
@@ -142,8 +141,7 @@ object TxInitRbfTlv {
   val txInitRbfTlvCodec: Codec[TlvStream[TxInitRbfTlv]] = tlvStream(discriminated[TxInitRbfTlv].by(varint)
     .typecase(UInt64(0), tlvField(satoshiSigned.as[SharedOutputContributionTlv]))
     .typecase(UInt64(2), requireConfirmedInputsCodec)
-    // We use a temporary TLV while the spec is being reviewed.
-    .typecase(UInt64(1339), requestFundingCodec)
+    .typecase(UInt64(5), requestFundingCodec)
   )
 }
 
@@ -155,8 +153,7 @@ object TxAckRbfTlv {
   val txAckRbfTlvCodec: Codec[TlvStream[TxAckRbfTlv]] = tlvStream(discriminated[TxAckRbfTlv].by(varint)
     .typecase(UInt64(0), tlvField(satoshiSigned.as[SharedOutputContributionTlv]))
     .typecase(UInt64(2), requireConfirmedInputsCodec)
-    // We use a temporary TLV while the spec is being reviewed.
-    .typecase(UInt64(1339), provideFundingCodec)
+    .typecase(UInt64(5), provideFundingCodec)
   )
 }
 
@@ -166,8 +163,7 @@ object SpliceInitTlv {
 
   val spliceInitTlvCodec: Codec[TlvStream[SpliceInitTlv]] = tlvStream(discriminated[SpliceInitTlv].by(varint)
     .typecase(UInt64(2), requireConfirmedInputsCodec)
-    // We use a temporary TLV while the spec is being reviewed.
-    .typecase(UInt64(1339), requestFundingCodec)
+    .typecase(UInt64(5), requestFundingCodec)
     .typecase(UInt64(0x47000007), tlvField(tmillisatoshi.as[PushAmountTlv]))
   )
 }
@@ -178,8 +174,7 @@ object SpliceAckTlv {
 
   val spliceAckTlvCodec: Codec[TlvStream[SpliceAckTlv]] = tlvStream(discriminated[SpliceAckTlv].by(varint)
     .typecase(UInt64(2), requireConfirmedInputsCodec)
-    // We use a temporary TLV while the spec is being reviewed.
-    .typecase(UInt64(1339), provideFundingCodec)
+    .typecase(UInt64(5), provideFundingCodec)
     .typecase(UInt64(41042), feeCreditUsedCodec)
     .typecase(UInt64(0x47000007), tlvField(tmillisatoshi.as[PushAmountTlv]))
   )
@@ -197,8 +192,7 @@ object AcceptDualFundedChannelTlv {
     .typecase(UInt64(0), upfrontShutdownScriptCodec)
     .typecase(UInt64(1), channelTypeCodec)
     .typecase(UInt64(2), requireConfirmedInputsCodec)
-    // We use a temporary TLV while the spec is being reviewed.
-    .typecase(UInt64(1339), provideFundingCodec)
+    .typecase(UInt64(5), provideFundingCodec)
     .typecase(UInt64(41042), feeCreditUsedCodec)
     .typecase(UInt64(0x47000007), pushAmountCodec)
   )

diff --git a/eclair-core/src/main/scala/fr/acinq/eclair/wire/protocol/RoutingTlv.scala b/eclair-core/src/main/scala/fr/acinq/eclair/wire/protocol/RoutingTlv.scala
@@ -39,8 +39,7 @@ object NodeAnnouncementTlv {
   case class OptionWillFund(rates: LiquidityAds.WillFundRates) extends NodeAnnouncementTlv
 
   val nodeAnnouncementTlvCodec: Codec[TlvStream[NodeAnnouncementTlv]] = tlvStream(discriminated[NodeAnnouncementTlv].by(varint)
-    // We use a temporary TLV while the spec is being reviewed.
-    .typecase(UInt64(1339), tlvField(LiquidityAds.Codecs.willFundRates.as[OptionWillFund]))
+    .typecase(UInt64(5), tlvField(LiquidityAds.Codecs.willFundRates.as[OptionWillFund]))
   )
 }
 

diff --git a/eclair-core/src/main/scala/fr/acinq/eclair/wire/protocol/SetupAndControlTlv.scala b/eclair-core/src/main/scala/fr/acinq/eclair/wire/protocol/SetupAndControlTlv.scala
@@ -58,8 +58,7 @@ object InitTlvCodecs {
   val initTlvCodec = tlvStream(discriminated[InitTlv].by(varint)
     .typecase(UInt64(1), networks)
     .typecase(UInt64(3), remoteAddress)
-    // We use a temporary TLV while the spec is being reviewed.
-    .typecase(UInt64(1339), willFund)
+    .typecase(UInt64(5), willFund)
   )
 
 }