Skip to content

Commit 82debec

Browse files
committed
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.
1 parent 7372a87 commit 82debec

File tree

4 files changed

+24
-32
lines changed

4 files changed

+24
-32
lines changed

eclair-core/src/main/scala/fr/acinq/eclair/wire/protocol/ChannelTlv.scala

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -134,8 +134,7 @@ object OpenDualFundedChannelTlv {
134134
.typecase(UInt64(0), upfrontShutdownScriptCodec)
135135
.typecase(UInt64(1), channelTypeCodec)
136136
.typecase(UInt64(2), requireConfirmedInputsCodec)
137-
// We use a temporary TLV while the spec is being reviewed.
138-
.typecase(UInt64(1339), requestFundingCodec)
137+
.typecase(UInt64(5), requestFundingCodec)
139138
.typecase(UInt64(0x47000007), pushAmountCodec)
140139
)
141140
}
@@ -156,8 +155,7 @@ object TxInitRbfTlv {
156155
val txInitRbfTlvCodec: Codec[TlvStream[TxInitRbfTlv]] = tlvStream(discriminated[TxInitRbfTlv].by(varint)
157156
.typecase(UInt64(0), tlvField(satoshiSigned.as[SharedOutputContributionTlv]))
158157
.typecase(UInt64(2), requireConfirmedInputsCodec)
159-
// We use a temporary TLV while the spec is being reviewed.
160-
.typecase(UInt64(1339), requestFundingCodec)
158+
.typecase(UInt64(5), requestFundingCodec)
161159
)
162160
}
163161

@@ -169,8 +167,7 @@ object TxAckRbfTlv {
169167
val txAckRbfTlvCodec: Codec[TlvStream[TxAckRbfTlv]] = tlvStream(discriminated[TxAckRbfTlv].by(varint)
170168
.typecase(UInt64(0), tlvField(satoshiSigned.as[SharedOutputContributionTlv]))
171169
.typecase(UInt64(2), requireConfirmedInputsCodec)
172-
// We use a temporary TLV while the spec is being reviewed.
173-
.typecase(UInt64(1339), provideFundingCodec)
170+
.typecase(UInt64(5), provideFundingCodec)
174171
)
175172
}
176173

@@ -180,8 +177,7 @@ object SpliceInitTlv {
180177

181178
val spliceInitTlvCodec: Codec[TlvStream[SpliceInitTlv]] = tlvStream(discriminated[SpliceInitTlv].by(varint)
182179
.typecase(UInt64(2), requireConfirmedInputsCodec)
183-
// We use a temporary TLV while the spec is being reviewed.
184-
.typecase(UInt64(1339), requestFundingCodec)
180+
.typecase(UInt64(5), requestFundingCodec)
185181
.typecase(UInt64(0x47000007), tlvField(tmillisatoshi.as[PushAmountTlv]))
186182
.typecase(UInt64(0x47000011), channelTypeCodec.as[ChannelTypeTlv])
187183
)
@@ -193,8 +189,7 @@ object SpliceAckTlv {
193189

194190
val spliceAckTlvCodec: Codec[TlvStream[SpliceAckTlv]] = tlvStream(discriminated[SpliceAckTlv].by(varint)
195191
.typecase(UInt64(2), requireConfirmedInputsCodec)
196-
// We use a temporary TLV while the spec is being reviewed.
197-
.typecase(UInt64(1339), provideFundingCodec)
192+
.typecase(UInt64(5), provideFundingCodec)
198193
.typecase(UInt64(41042), feeCreditUsedCodec)
199194
.typecase(UInt64(0x47000007), tlvField(tmillisatoshi.as[PushAmountTlv]))
200195
.typecase(UInt64(0x47000011), channelTypeCodec.as[ChannelTypeTlv])
@@ -213,8 +208,7 @@ object AcceptDualFundedChannelTlv {
213208
.typecase(UInt64(0), upfrontShutdownScriptCodec)
214209
.typecase(UInt64(1), channelTypeCodec)
215210
.typecase(UInt64(2), requireConfirmedInputsCodec)
216-
// We use a temporary TLV while the spec is being reviewed.
217-
.typecase(UInt64(1339), provideFundingCodec)
211+
.typecase(UInt64(5), provideFundingCodec)
218212
.typecase(UInt64(41042), feeCreditUsedCodec)
219213
.typecase(UInt64(0x47000007), pushAmountCodec)
220214
)

eclair-core/src/main/scala/fr/acinq/eclair/wire/protocol/RoutingTlv.scala

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,7 @@ object NodeAnnouncementTlv {
3939
case class OptionWillFund(rates: LiquidityAds.WillFundRates) extends NodeAnnouncementTlv
4040

4141
val nodeAnnouncementTlvCodec: Codec[TlvStream[NodeAnnouncementTlv]] = tlvStream(discriminated[NodeAnnouncementTlv].by(varint)
42-
// We use a temporary TLV while the spec is being reviewed.
43-
.typecase(UInt64(1339), tlvField(LiquidityAds.Codecs.willFundRates.as[OptionWillFund]))
42+
.typecase(UInt64(5), tlvField(LiquidityAds.Codecs.willFundRates.as[OptionWillFund]))
4443
)
4544
}
4645

eclair-core/src/main/scala/fr/acinq/eclair/wire/protocol/SetupAndControlTlv.scala

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,7 @@ object InitTlvCodecs {
5858
val initTlvCodec = tlvStream(discriminated[InitTlv].by(varint)
5959
.typecase(UInt64(1), networks)
6060
.typecase(UInt64(3), remoteAddress)
61-
// We use a temporary TLV while the spec is being reviewed.
62-
.typecase(UInt64(1339), willFund)
61+
.typecase(UInt64(5), willFund)
6362
)
6463

6564
}

0 commit comments

Comments
 (0)