Skip to content

Commit 559f6fa

Browse files
committed
Update taproot-specific TLV ids (no functional changes)
1 parent f8a9860 commit 559f6fa

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -296,8 +296,8 @@ object ChannelReestablishTlv {
296296
.typecase(UInt64(0), NextFundingTlv.codec)
297297
.typecase(UInt64(1), YourLastFundingLockedTlv.codec)
298298
.typecase(UInt64(3), MyCurrentFundingLockedTlv.codec)
299-
.typecase(UInt64(4), NextLocalNoncesTlv.codec)
300-
.typecase(UInt64(6), CurrentCommitNonceTlv.codec)
299+
.typecase(UInt64(22), NextLocalNoncesTlv.codec)
300+
.typecase(UInt64(24), CurrentCommitNonceTlv.codec)
301301
)
302302
}
303303

@@ -363,9 +363,9 @@ object ClosingCompleteTlv {
363363
.typecase(UInt64(1), tlvField(bytes64.as[ClosingTlv.CloserOutputOnly]))
364364
.typecase(UInt64(2), tlvField(bytes64.as[ClosingTlv.CloseeOutputOnly]))
365365
.typecase(UInt64(3), tlvField(bytes64.as[ClosingTlv.CloserAndCloseeOutputs]))
366-
.typecase(UInt64(4), tlvField(partialSignatureWithNonce.as[CloserOutputOnlyPartialSignature]))
367-
.typecase(UInt64(5), tlvField(partialSignatureWithNonce.as[CloseeOutputOnlyPartialSignature]))
368-
.typecase(UInt64(6), tlvField(partialSignatureWithNonce.as[CloserAndCloseeOutputsPartialSignature]))
366+
.typecase(UInt64(5), tlvField(partialSignatureWithNonce.as[CloserOutputOnlyPartialSignature]))
367+
.typecase(UInt64(6), tlvField(partialSignatureWithNonce.as[CloseeOutputOnlyPartialSignature]))
368+
.typecase(UInt64(7), tlvField(partialSignatureWithNonce.as[CloserAndCloseeOutputsPartialSignature]))
369369
)
370370
}
371371

@@ -388,9 +388,9 @@ object ClosingSigTlv {
388388
.typecase(UInt64(1), tlvField(bytes64.as[ClosingTlv.CloserOutputOnly]))
389389
.typecase(UInt64(2), tlvField(bytes64.as[ClosingTlv.CloseeOutputOnly]))
390390
.typecase(UInt64(3), tlvField(bytes64.as[ClosingTlv.CloserAndCloseeOutputs]))
391-
.typecase(UInt64(4), tlvField(bytes32.as[CloserOutputOnlyPartialSignature]))
392-
.typecase(UInt64(5), tlvField(bytes32.as[CloseeOutputOnlyPartialSignature]))
393-
.typecase(UInt64(6), tlvField(bytes32.as[CloserAndCloseeOutputsPartialSignature]))
391+
.typecase(UInt64(5), tlvField(bytes32.as[CloserOutputOnlyPartialSignature]))
392+
.typecase(UInt64(6), tlvField(bytes32.as[CloseeOutputOnlyPartialSignature]))
393+
.typecase(UInt64(7), tlvField(bytes32.as[CloserAndCloseeOutputsPartialSignature]))
394394
.typecase(UInt64(22), tlvField(publicNonce.as[NextCloseeNonce]))
395395
)
396396
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,6 @@ object RevokeAndAckTlv {
127127
}
128128

129129
val revokeAndAckTlvCodec: Codec[TlvStream[RevokeAndAckTlv]] = tlvStream(discriminated[RevokeAndAckTlv].by(varint)
130-
.typecase(UInt64(6), NextLocalNoncesTlv.codec)
130+
.typecase(UInt64(22), NextLocalNoncesTlv.codec)
131131
)
132132
}

0 commit comments

Comments
 (0)